[Top][All Lists]

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

Re: Newly added files in a branch

From: Larry Jones
Subject: Re: Newly added files in a branch
Date: Mon, 18 Nov 2002 20:37:05 -0500 (EST)

Johnny John writes:
> (a)  I'm working happily in branch A
> (b)  Mainline moving forward in time happily
> (c)  I decide to move my branch forward, i.e. re-sprout it later in time
> (d)  I check out the tip of the mainline
> (e)  I do a cvs update -j of branch A
> (f)  I create a new branch B at the tip and check in results of (e) into 
> the new branch
> Issue I have seen is that any newly added files from branch A do not appear 
> in branch B.  Instead, they appear on the mainline.  So, when I check out 
> the new branch B, I do not get these files.

You went wrong at step (e).  I think this will do what you want:

(e)  Create a new branch B by tagging what you just checked out.
(f)  Move your working directory to the branch with update -r.
(g)  Now merge in Branch A with update -j.
(h)  Checkin should now do the right thing.

-Larry Jones

I wonder what's on TV now. -- Calvin

reply via email to

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