From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 93694 invoked by alias); 15 Nov 2015 17:14:30 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 93681 invoked by uid 89); 15 Nov 2015 17:14:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sun, 15 Nov 2015 17:14:27 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 253772971E; Sun, 15 Nov 2015 12:14:26 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 37qepueSrEaN; Sun, 15 Nov 2015 12:14:26 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id CF6F229390; Sun, 15 Nov 2015 12:14:25 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 907EF42E6A; Sun, 15 Nov 2015 09:14:23 -0800 (PST) Date: Sun, 15 Nov 2015 17:14:00 -0000 From: Joel Brobecker To: Sandra Loosemore Cc: Pedro Alves , gdb-patches@sourceware.org Subject: Re: FYI: GDB 7.10.1 release still planned end of Nov Message-ID: <20151115171423.GA4009@adacore.com> References: <20151028164757.GC4009@adacore.com> <5631005E.9070208@redhat.com> <20151112184430.GA4646@adacore.com> <5644E0A4.8020901@codesourcery.com> <20151112193849.GB4646@adacore.com> <56467ED6.9030104@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <56467ED6.9030104@codesourcery.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-11/txt/msg00302.txt.bz2 > > 2. Then, create a gdb-7.10-branch branch in your repository: > > > > % git branch --track gdb-7.10-branch origin/gdb-7.10-branch > > > > You can then cherry-pick the change to that branch: > > > > % git checkout gdb-7.10-branch > > I'm really confused. At this point, "git log" shows that my patch is > already present in the checkout as commit > e13cbb569965ee3baca2ad4801eeb910c2b2f03f, dated Tue Aug 18. > > > % git cherry-pick 26d56a939e9e54e09d46ea6e9678463ac344fa33 > > [you will probably need to fix ChangeLog conflicts] > > ...and "git diff" after this step only shows ChangeLog conflicts and no code > changes. > > > And once all is ready, then just push to the FSF repo: > > > > % git push origin gdb-7.10-branch > > Is there something different I need to do here, did I screw up something in > the recipe above, or is the patch really already present on the branch and > you and Pedro just lost track of it? You did good! What happens is that you backported the patch in time for it to be part of GDB 7.10. I'll update the release wiki page, and close the PR you opened. Sorry about the confusion, and thanks for following up. -- Joel