From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28970 invoked by alias); 19 Sep 2002 20:12:04 -0000 Mailing-List: contact gdb-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sources.redhat.com Received: (qmail 28963 invoked from network); 19 Sep 2002 20:12:04 -0000 Received: from unknown (HELO crack.them.org) (65.125.64.184) by sources.redhat.com with SMTP; 19 Sep 2002 20:12:04 -0000 Received: from nevyn.them.org ([66.93.61.169] ident=mail) by crack.them.org with asmtp (Exim 3.12 #1 (Debian)) id 17s8aZ-0007yr-00; Thu, 19 Sep 2002 16:11:55 -0500 Received: from drow by nevyn.them.org with local (Exim 3.35 #1 (Debian)) id 17s7eU-0001it-00; Thu, 19 Sep 2002 16:11:54 -0400 Date: Thu, 19 Sep 2002 13:12:00 -0000 From: Daniel Jacobowitz To: Kevin Buettner Cc: David Carlton , gdb@sources.redhat.com Subject: Re: branching Message-ID: <20020919201154.GA6607@nevyn.them.org> Mail-Followup-To: Kevin Buettner , David Carlton , gdb@sources.redhat.com References: <20020917143553.GA28408@nevyn.them.org> <20020917174928.GA23058@nevyn.them.org> <3D87815A.4010807@ges.redhat.com> <1020919193025.ZM22088@localhost.localdomain> <1020919200745.ZM22299@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1020919200745.ZM22299@localhost.localdomain> User-Agent: Mutt/1.5.1i X-SW-Source: 2002-09/txt/msg00286.txt.bz2 On Thu, Sep 19, 2002 at 01:07:46PM -0700, Kevin Buettner wrote: > On Sep 19, 12:35pm, David Carlton wrote: > > > > Maybe I'm being naive, but why can't you just checkout your branch, > > > and then do: > > > > > cvs update -j HEAD > > > > Ah: maybe that's part of the answer: maybe I should do > > > > cvs update -j carlton-dictionary-YYYYMMDD-tag -j HEAD > > > > (I'd missed the keyword HEAD.) > > > > Section 5.7 of the CVS manual suggests that what you say isn't a good > > idea, because it claims that CVS will try to merge in all changes to > > head since the original branch, rather than all changes since I last > > merged. > > I see. That sounds right. > > > If that's accurate, I need to get tags on the head somehow so > > that it doesn't try to merge in changes twice. > > Maybe just keep track of the date of the last merge and do: > > cvs update -j HEAD:date -j HEAD > > Another approach might be to use the -F option with ``cvs tag'' so that > you only need one merge tag (for your branch) on the mainline. > > (If you try the -j HEAD:date approach, let me know how it works...) It should work fine... but if you do that, specify an explicit date on both. It makes it much simpler to do the next merge. -- Daniel Jacobowitz MontaVista Software Debian GNU/Linux Developer