[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: branching blues
RE: branching blues
Tue, 23 Mar 2004 09:26:58 -0800
Conrad, Jim, Larry -
Thanks for your fast and clear help.
>From your specific guidance I can see that the cvs behavior I described is
and I can see a way to accomplish my objectives.
I'm curious - in regard to the issue I'm addressing -
. multiple implementation approaches of a given feature,
. all on 'peer' branches of the same trunk tag,
. winning approach gets merged
- anyone out there have suggestions or experience on a better way to do this
than I've chosen?
I am sorry for the difficulties I caused posting in HTML with a small font -
and I appreciate the help in spite of this annoyance.
I reconfigured my mail client and tested and I expect that this posting is
coming through as clear text in a reasonable font size;
please let me know if thats not happening.
>>> "Jim.Hyslop" <address@hidden> 03/23/04 06:22AM >>>
Steve Widmar wrote:
> Content-Description: HTML
Please do not post HTML. In particular, your choice of font is very
difficult to read.
> After checking out a branch, and changing certain files and
> adding new ones in pursuit of implementing the new feature ...
> Imagine my surprise when I find that, while I can commit
> changes to files on the branch, and add/commit new files to
> directories that existed prior to branching,
> if i want to add/commit a file that is in a directory that
> did not exist prior to branching I can, but it adds the file
> to the Attic leaf subdir of the actual dir it lives in.
That's OK, it just needs to be "resurrected" in the trunk.
First, make sure you update _without_ the -P option - you don't want to
prune empty directories.
For each file you want to keep, issue the command:
cvs update -p -rbranchtag filename > filename
where 'branchtag' is the tag you want, and 'filename' is the name of the
Now, add the files as normal:
cvs add filename
CVS will respond something like:
cvs server: re-adding file filename (in place of dead revision 1.1)
cvs server: use 'cvs commit' to add this file permanently
Make sure it builds, etc., then commit and away you go.
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)
Info-cvs mailing list