info-cvs
[Top][All Lists]
Advanced

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

Re: Copy from a branch into working dir?


From: weberjacob
Subject: Re: Copy from a branch into working dir?
Date: 18 Oct 2005 04:56:53 -0700
User-agent: G2/0.2

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.

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.



reply via email to

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