Re: Update from branch

[Mike Castle]

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

It should NOT have worked like that UNLESS you specified the -A option.

> like this.Do I have to give update with -r option or
> something like that,if I want to update my working

In general, no, you should not have to specify -r.

> files from the branch?Does cvs update from trunk by
> default?Pls clarify.

I assume you did not commit the changes to the main branch, realizing that
that is not what you wanted to do.

If that is indeed the case, then you should simply be able to do a 
cvs up -r branch to get back to where you thought you should be.

mrc
-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc