[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: Pierre Asselin
Subject: Re: can I use rtag to tag files in a branch
Date: Thu, 08 Feb 2001 14:45:18 -0700

Mike Castle wrote:
> Since there is a race condition where someone coudl check in a file on the
> branch after you did the merge but before you tagged, I would recommend not
> trying to use rtag anyway.
> Instead, check out the branch  you want to merge, tag there, then do the
> merge.

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
    ... cd module, fix conflicts ...
    $ cvs commit
    $ cvs tag -F -rMERGE_ATTEMPT branch_LAST_MERGE
    $ cvs tag -d MERGE_ATTEMPT

Pierre Asselin
Westminster, Colorado

reply via email to

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