[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Best practice for making changes to "old" branches

From: Adam Lipscombe
Subject: RE: Best practice for making changes to "old" branches
Date: Fri, 31 Mar 2006 15:54:40 +0100

Excellent tips - many thanks.


-----Original Message-----
From: address@hidden
[mailto:address@hidden On Behalf
Of Sergei Organov
Sent: 31 March 2006 13:40
To: address@hidden
Subject: Re: Best practice for making changes to "old" branches

"Adam Lipscombe" <address@hidden> writes:
> If we fix it in their original branch, how do we propagate the change 
> into the head? (The branch has already been merged in?)

CVS doesn't remember what has and what has not been merged, so you are free
to merge as many times as you wish. However, to prevent excessive conflicts,
you may wish to do it as follows:

Checkout the branch and tag it's current state if you didn't yet. E.g.,

cvs get -r the_branch the_module
cd the_module
cvs tag the_branch_last_merge

then make changes on the branch, commit them, then in a directory that
contains checked-out mainline, do

cvs update -dP -j the_branch_last_merge -j the_branch
... resolve conflicts (if any), test the resulting changes, etc. ... cvs

then don't forget to change back to the the_module on the_branch directory
and move the 'the_branch_last_merge' tag:

cvs update -dP
cvs tag -F the_branch_last_merge

so that next time you do another change to this branch you will have a
correct "last merge" point.

However, if I were in this situation, I'd merge to the "2 branches ago"
branch first, then from "2 branches ago" to "1 branch ago", and finally to
the mainline. I'm sure you'll figure out how to do it using the above hints.

-- Sergei.

info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]