On 18 Oct 2005 04:56:53 -0700, address@hidden <address@hidden
> wrote:Thanks Jim.
That seems to work, with one minor change. It seems that if I don't
first "rm" the file before doing the initial update, I don't always get
the latest version. For example, if the tip of the branch is a
deletion, when I do
cvs update -rBRANCH2
it doesn't delete the file. But if I remove the file first, it has the
same effect; the file will be deleted if the tip of the branch is a
deletion, and otherwise it will be restored. Does this make sense? I
hope I'm doing this right.
I think this will do what you want. See cvs -H update for more info on the cmdline flags.
cvs update -Pd -r BRANCH2
The merge with -j -j works great, thanks. Will this work on binary
files? E.g. will it actually try to merge them, or will it be smart
enough to just put the right version in? I'll give it a try.
_______________________________________________
Info-cvs mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/info-cvs