From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29963 invoked by alias); 19 Sep 2002 21:52:55 -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 29956 invoked from network); 19 Sep 2002 21:52:53 -0000 Received: from unknown (HELO valrhona.uglyboxes.com) (64.1.192.220) by sources.redhat.com with SMTP; 19 Sep 2002 21:52:53 -0000 Received: from localhost.localdomain (IDENT:oP/IWdEkQxchPT0QWcPybHTnz+xcZbQA@localhost.localdomain [127.0.0.1]) by valrhona.uglyboxes.com (8.11.6/8.11.6) with ESMTP id g8JLtYf01726; Thu, 19 Sep 2002 14:55:35 -0700 Date: Thu, 19 Sep 2002 14:52:00 -0000 From: Keith Seitz X-X-Sender: keiths@valrhona.uglyboxes.com To: David Carlton cc: gdb@sources.redhat.com Subject: Re: branching In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SW-Source: 2002-09/txt/msg00292.txt.bz2 On 19 Sep 2002, David Carlton wrote: > Great, glad to hear I'm on track. Could you tell me exactly what you > type to create the merge tags on the mainline and to update your > branch to reflect the changes between two mainline merge tags? (And > whatever words of wisdom you have on the subject of, when you use cvs > rtag to create a tag, what branch(es?) that tags applies to, would be > greatly appreciated.) Sure. To create the symbol tag in mainline (I use rtag, since it will tag the repository copy, not any local copy): $ cvs rtag kseitz_interps-DATE-merge gdb+dejagnu Then to apply the tag to my branch, I "cd" into my branch sources $ cd my-branch/src $ cvs -q update -j kseitz_interps-LASTDATE-merge \ -j kseitz_interps-DATE-merge gdb+dejagnu Finally resolve any conflicts and "cvs ci". > And, given that I'm probably temperamentally suited to relatively > frequent merges, I'll want to take Kevin's advice and delete merge > tags that I haven't used for a while. Hmm, yeah, I guess I should do that, too. Keith