dev branches - cvs

[KM]

a theoretical question...


it is an easy concept when you create a branch of the production version from a tag or latest trunk and use it for updates or bug fixes...you may then elect to merge the branch back in to the trunk where future dev has started.

however if you create a branch for development and use it for a long period while another version is going along the trunk.... to keep up with the latest code from the trunk... don't you need to merge into the branch any changes using diff or something, so you know current dev isn't corrupting or messing up your dev on the branch for the future?   If so what's the best method..... especially if later you wish to merge your changes from the dev branch back to the trunk?

Just thinking out loud
KM

[Larry Jones]

Post by KM
however if you create a branch for development and use it for a long
period while another version is going along the trunk.... to keep up
with the latest code from the trunk... don't you need to merge into the
branch any changes using diff or something, so you know current dev
isn't corrupting or messing up your dev on the branch for the future?  

Yep.

Post by KM
If so what's the best method..... especially if later you wish to merge
your changes from the dev branch back to the trunk?

The best thing to do is to periodically merge the changes from the trunk
into your development branch using an ordinary merge. You can use a
moving tag to keep track of what's been merged and what hasn't:

# on the main branch:
cvs tag br_merge

# on the branch:
cvs up -jbr_last_merge -jbr_merge

# back on the main branch:
cvs tag -F -rbr_merge br_last_merge
cvs tag -d br_merge

[Arthur Barrett]

Larry/KM,

Post by Larry Jones
into your development branch using an ordinary merge. You can use a

Note: If using CVSNT you don't need to tag and merge since the merge
automatically creates a mergepoint.

Regards,


Arthur

[KM]

 
Also - if the developers are using Eclipse does that affect this in any way?  Just thought I'd ask.  wasn't sure if Eclipse was tracking anything and able to just merge trunk changes into branch periodically for dev.
 
KM

From: Arthur Barrett <***@march-hare.com>
To: Larry Jones <***@siemens.com>; ***@yahoo.com
Cc: cvs-user-list <info-***@nongnu.org>
Sent: Saturday, July 30, 2011 11:12 PM
Subject: RE: dev branches - cvs

Larry/KM,

into your development branch using an ordinary merge.  You can use a

Note: If using CVSNT you don't need to tag and merge since the merge
automatically creates a mergepoint.

Regards,


Arthur

[Arthur Barrett]

KM,

Post by KM
 
Also - if the developers are using Eclipse does that affect
this in any way?  Just thought I'd ask.  wasn't sure if
Eclipse was tracking anything and able to just merge trunk
changes into branch periodically for dev.
 

Eclipse is not CVS. Plesee ask an Eclipse forum.

I personally consider 'merge' or 'promote' an administrative function, not something that developers should be doing from an IDE.

Regards,


Arthur Barrett