From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14379 invoked by alias); 19 Sep 2002 19:35:50 -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 14372 invoked from network); 19 Sep 2002 19:35:49 -0000 Received: from unknown (HELO jackfruit.Stanford.EDU) (171.64.38.136) by sources.redhat.com with SMTP; 19 Sep 2002 19:35:49 -0000 Received: (from carlton@localhost) by jackfruit.Stanford.EDU (8.11.6/8.11.6) id g8JJZcK24023; Thu, 19 Sep 2002 12:35:38 -0700 X-Authentication-Warning: jackfruit.Stanford.EDU: carlton set sender to carlton@math.stanford.edu using -f To: Kevin Buettner Cc: gdb@sources.redhat.com Subject: Re: branching References: <20020917143553.GA28408@nevyn.them.org> <20020917174928.GA23058@nevyn.them.org> <3D87815A.4010807@ges.redhat.com> <1020919193025.ZM22088@localhost.localdomain> From: David Carlton Date: Thu, 19 Sep 2002 12:35:00 -0000 In-Reply-To: <1020919193025.ZM22088@localhost.localdomain> Message-ID: User-Agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2002-09/txt/msg00282.txt.bz2 On Thu, 19 Sep 2002 12:30:26 -0700, Kevin Buettner said: > On Sep 19, 12:12pm, David Carlton wrote: >> And to merge changes in from mainline, here's what I might do, but I'm >> confused by it: >> >> (All commands assume I'm in the branch's working directory, though it >> shouldn't matter for the first command.) >> >> 1) Create a tag saying where the merges should end: >> >> cvs rtag carlton-dictionary-YYYYMMDD-tag gdb+dejagnu >> >> 2) Merge in changes from my previous merge tag to the current merge >> tag: >> >> cvs update -j carlton-dictionary-PreviousYYYYMMDD-tag >> -j carlton-dictionary-YYYYMMDD-tag >> >> (The first time I do this, the first -tag will actually be >> -branchpoint.) > 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. If that's accurate, I need to get tags on the head somehow so that it doesn't try to merge in changes twice. David Carlton carlton@math.stanford.edu