(no subject)

[root]

>From address@hidden  Fri Feb  9 06:59:22 2001
>Return-Path: <address@hidden>
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164])
        by gateway.camelot.jp (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
GAA18587
        for <address@hidden>; Fri, 9 Feb 2001 06:59:21 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14QysG-0003DX-00; Thu, 08 Feb 2001 16:45:08 -0500
Received: from verano.sba.ca.us ([204.144.244.103])
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14QypP-00039v-00
        for <address@hidden>; Thu, 08 Feb 2001 16:42:12 -0500
Received: from verano.sba.ca.us (address@hidden [127.0.0.1])
        by verano.sba.ca.us (8.8.7/8.8.7) with ESMTP id OAA21048
        for <address@hidden>; Thu, 8 Feb 2001 14:45:18 -0700
Message-Id: <address@hidden>
X-Mailer: exmh version 2.0.2
To: address@hidden
Subject: Re: can I use rtag to tag files in a branch 
In-Reply-To: Your message of "Thu, 08 Feb 2001 12:43:18 PST."
             <address@hidden> 
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Pierre Asselin <address@hidden>
Sender: address@hidden
Errors-To: address@hidden
X-BeenThere: address@hidden
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:address@hidden>
List-Post: <mailto:address@hidden>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Id: Announcements and discussions for the CVS version control system 
<info-cvs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Archive: <http://mail.gnu.org/pipermail/info-cvs/>
Date: Thu, 08 Feb 2001 14:45:18 -0700
Status: O
Content-Length: 769
Lines: 28


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


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs