From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25051 invoked by alias); 12 May 2006 12:43:40 -0000 Received: (qmail 25041 invoked by uid 22791); 12 May 2006 12:43:39 -0000 X-Spam-Check-By: sourceware.org Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Fri, 12 May 2006 12:43:34 +0000 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1FeWzU-0000x4-HG; Fri, 12 May 2006 08:43:32 -0400 Date: Fri, 12 May 2006 13:24:00 -0000 From: Daniel Jacobowitz To: Nick Roberts Cc: gdb@sources.redhat.com Subject: Re: New branch [was Re: RFC: MI output during program execution] Message-ID: <20060512124331.GA3460@nevyn.them.org> Mail-Followup-To: Nick Roberts , gdb@sources.redhat.com References: <17458.60694.135878.624750@farnswood.snap.net.nz> <20060404220637.GA12064@nevyn.them.org> <17486.36188.127822.347550@farnswood.snap.net.nz> <20060504150414.GE32605@nevyn.them.org> <17508.18716.564160.93092@farnswood.snap.net.nz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <17508.18716.564160.93092@farnswood.snap.net.nz> User-Agent: Mutt/1.5.8i X-IsSubscribed: yes Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2006-05/txt/msg00162.txt.bz2 On Fri, May 12, 2006 at 08:36:44PM +1200, Nick Roberts wrote: > I've used ChangeLog for changes on the branch because I thought it would > make commits easier (certainly from Emacs) but maybe that wasn't so clever > as merges might be harder. Right on both counts :-) > I've called it 6.4.50.20060512-nickrob-async. I took the date from the one > I was given but because we're ahead of the rest of the world here in NZ, I > had already used 20060513 for the branch name. Perhaps I should change it to > 6.4.50.20060513-nickrob-async to be consistent? Don't worry about it too much. > Actually thats quite a lot of data and probably not of general interest. Shall > I just post the ChangeLog? I suppose; I can always grab the branch and diff it myself. > > > 7) Do regular merges with trunk: > > > > > > cvs update -j HEAD (?) > > > > Well, it's more complicated than this. You need tags at mergepoints - > > see the last bit of the chapter which mentions cvs up -j. It's a bit of > > a pain. > > I can't get my head round mergepoints (what happens if someone elso commit > after your tag but before your commit?) but I'll worry about that later. The trick is that you do everything relative to the tags, including merges and other tags - nothing relative to HEAD. - Create new tag - Merge changes from last tag to new tag to branch. -- Daniel Jacobowitz CodeSourcery