[Top][All Lists]

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

Re: can I use rtag to tag files in a branch

From: Mike Castle
Subject: Re: can I use rtag to tag files in a branch
Date: Thu, 8 Feb 2001 15:00:39 -0800
User-agent: Mutt/1.3.6i

On Thu, Feb 08, 2001 at 02:45:18PM -0700, Pierre Asselin wrote:
> Mike Castle wrote:
> > Since there is a race condition where someone coudl check in a file on the
> Seems to me Trevor could do the rtag first, then the merge.


>     $ cvs rtag -rbranch MERGE_ATTEMPT
>     $ cvs checkout -jbranch_LAST_MERGE -jMERGE_ATTEMPT module

oh... You can merge and checkout in the same command?  I never tried that.
Just update.

>     $ cvs tag -F -rMERGE_ATTEMPT branch_LAST_MERGE
>     $ cvs tag -d MERGE_ATTEMPT

Personally, I always keep the merge tags.  And use them in the comments of
the commit.

But then, I don't mind having a couple hundred tags around.

       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen

reply via email to

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