info-cvs
[Top][All Lists]
Advanced

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

Re: Branch merging


From: Mike Castle
Subject: Re: Branch merging
Date: Tue, 24 Apr 2001 11:09:05 -0700
User-agent: Mutt/1.3.6i

On Tue, Apr 24, 2001 at 09:52:56AM -0700, Prakash Ranade wrote:
> branch 2.2 and commits to branch 2.2 for long period of time, How can we
> stop his commiting to branch 2.2. Also how can we took his changes and
> merge back into main tree.


For his commits, I don't think there is much you can do except to inform
him.  Then have him update to the main branch with "cvs up -A"

For migrating his changes over, you have a couple of options.

If you tagged the 2.2 branch when you did the merge, you can do something
like the following:

cvs up -A  # get on the main branch
cvs up -j tag_from_last_merge -j branch_name_for_2_2
# resolve any conflicts or other issues here
cvs commit -m "merged in Joe's additional changes on the 2.2 branch"

If you didn't tag, then you will have to use the date you did the merge:

cvs up -A
cvs up -D 2001-04-05 -j branch_name_for_2_2
# resovle any conflicts or other issues here
cvs commit -m "merged in Joe's additional changes on the 2.2 branch"

Of course, in this scenario, you run into the chance of trying to remerge
code already merged, but hopefully that won't be too bad.

Whenever I migrate changes from one branch to another, I *always* use
explicit tags.  Makes it easier to handle situations like this.

mrc
-- 
       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen



reply via email to

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