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.
Doh!
> $ 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.
mrc
--
Mike Castle Life is like a clock: You can work constantly
[EMAIL PROTECTED] and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
