Re: Update from branch

[Eric Siegerman]

On Tue, Jul 24, 2001 at 04:56:38PM -0700, Anita Chacko wrote:
> I have a working directory where I have files checked
> out from a branch.When I ran a cvs update from within
> this working directory,it has brought all changes from
> main trunk into these files.I did not know it works
> like this.

It doesn't -- or at least, it's not supposed to!

> Do I have to give update with -r option or
> something like that,if I want to update my working
> files from the branch?Does cvs update from trunk by
> default?

No, and no.

OK, what happened to you isn't supposed to happen.  Let's try to
figure out why it did.

Did you type any "-j" options to the "cvs update"?  If so, that'd
explain it right there; only type those when you WANT to merge
changes from one branch to another.  (Actually, it's occasionally
useful to use "-j" within one branch, but only when you're trying
to do something fancy, NEVER for a simple get-recent-changes
update.)

If you DIDN'T type any "-j"'s, here are some more questions to
help us track down the problem:
  - What was the exact CVS command you typed?
  - What's the output of "cvs status -v" on a coupl of the files
    that this happened to?
  - If there are any files that it DIDN'T happen to, please
    include "cvs status -v" output on a couple of those too.
  - Which CVS version (both client and server, if appropriate)?

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
With sufficient thrust, pigs fly just fine. However, this is not
necessarily a good idea.
        - RFC 1925 (quoting an unnamed source)