From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-return-10438-listarch-gdb=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 12761 invoked by alias); 19 Sep 2002 19:30:41 -0000
Mailing-List: contact gdb-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb/>
List-Post: <mailto:gdb@sources.redhat.com>
List-Help: <mailto:gdb-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-owner@sources.redhat.com
Received: (qmail 12745 invoked from network); 19 Sep 2002 19:30:36 -0000
Received: from unknown (HELO mx1.redhat.com) (66.187.233.31)
  by sources.redhat.com with SMTP; 19 Sep 2002 19:30:36 -0000
Received: from int-mx2.corp.redhat.com (nat-pool-rdu-dmz.redhat.com [172.16.52.200])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id g8JJDHi22725
	for <gdb@sources.redhat.com>; Thu, 19 Sep 2002 15:13:17 -0400
Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15])
	by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id g8JJUSx22028;
	Thu, 19 Sep 2002 15:30:33 -0400
Received: from romulus.sfbay.redhat.com (remus.sfbay.redhat.com [172.16.27.252])
	by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id g8JJURC21539;
	Thu, 19 Sep 2002 12:30:27 -0700
Received: (from kev@localhost)
	by romulus.sfbay.redhat.com (8.11.6/8.11.6) id g8JJUQv22089;
	Thu, 19 Sep 2002 12:30:26 -0700
Date: Thu, 19 Sep 2002 12:30:00 -0000
From: Kevin Buettner <kevinb@redhat.com>
Message-Id: <1020919193025.ZM22088@localhost.localdomain>
In-Reply-To: David Carlton <carlton@math.stanford.edu>
        "branching" (Sep 19, 12:12pm)
References: <ro1fzw9h8r2.fsf@jackfruit.Stanford.EDU> 
	<20020917143553.GA28408@nevyn.them.org> 
	<ro1k7lkfr5d.fsf@jackfruit.Stanford.EDU> 
	<20020917174928.GA23058@nevyn.them.org> 
	<ro165x4fotl.fsf@jackfruit.Stanford.EDU> 
	<3D87815A.4010807@ges.redhat.com> 
	<ro1fzw5x08m.fsf_-_@jackfruit.Stanford.EDU>
To: David Carlton <carlton@math.stanford.edu>
Subject: Re: branching
Cc: gdb@sources.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2002-09/txt/msg00281.txt.bz2

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

Kevin