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 file. 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. -- Jim Hyslop 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 [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
