[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
(no subject)
From: |
root |
Subject: |
(no subject) |
Date: |
Mon, 13 Aug 2001 05:12:02 -0400 |
>From address@hidden Fri Feb 9 08:12:26 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
IAA18817
for <address@hidden>; Fri, 9 Feb 2001 08:12:24 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
id 14R05i-0008PL-00; Thu, 08 Feb 2001 18:03:06 -0500
Received: from phoenix.nanospace.com ([209.213.199.19])
by fencepost.gnu.org with smtp (Exim 3.16 #1 (Debian))
id 14R03O-0008O8-00
for <address@hidden>; Thu, 08 Feb 2001 18:00:43 -0500
Received: (qmail 7056 invoked from network); 8 Feb 2001 23:00:41 -0000
Received: from workstation-209-213-222-98.yy.com (HELO thune.mrc-home.org)
(209.213.222.98)
by phoenix.nanospace.com with SMTP; 8 Feb 2001 23:00:41 -0000
Received: by thune.mrc-home.org (8.10.0) id f18N0df15428; Thu, 8 Feb 2001
15:00:39 -0800
From: Mike Castle <address@hidden>
To: address@hidden
Subject: Re: can I use rtag to tag files in a branch
Message-ID: <address@hidden>
Reply-To: Mike Castle <address@hidden>
Mail-Followup-To: Mike Castle <address@hidden>, address@hidden
References: <address@hidden> <address@hidden>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
User-Agent: Mutt/1.3.6i
In-Reply-To: <address@hidden>; from address@hidden on Thu, Feb 08, 2001 at
02:45:18PM -0700
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, 8 Feb 2001 15:00:39 -0800
Status: O
Content-Length: 1088
Lines: 33
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
address@hidden 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
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs
- (no subject), (continued)
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject),
root <=
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13
- (no subject), root, 2001/08/13