From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14020 invoked by alias); 14 Nov 2015 00:23:01 -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 14008 invoked by uid 89); 14 Nov 2015 00:23:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 14 Nov 2015 00:22:59 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1ZxOcJ-00048U-JP from Sandra_Loosemore@mentor.com ; Fri, 13 Nov 2015 16:22:55 -0800 Received: from [IPv6:::1] (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Fri, 13 Nov 2015 16:22:55 -0800 Subject: Re: FYI: GDB 7.10.1 release still planned end of Nov To: Joel Brobecker References: <20151028164757.GC4009@adacore.com> <5631005E.9070208@redhat.com> <20151112184430.GA4646@adacore.com> <5644E0A4.8020901@codesourcery.com> <20151112193849.GB4646@adacore.com> CC: Pedro Alves , From: Sandra Loosemore Message-ID: <56467ED6.9030104@codesourcery.com> Date: Sat, 14 Nov 2015 00:23:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151112193849.GB4646@adacore.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2015-11/txt/msg00290.txt.bz2 On 11/12/2015 12:38 PM, Joel Brobecker wrote: > - For a fix that needs to be put on the branch, there must be > a PR. If not already existing, then it needs to be created at: > > https://sourceware.org/bugzilla/ > > This PR should document in as much details as possible the issue. > You can also hyper-link discussions on gdb-patches. OK, I have created PR 19245 for this. > Regarding backporting a change, it's super easy: > > 1. Find the SHA1 of the fix you pushed to master; I usually use > something like "git log --author=[...] --grep=[...] > > For instance, I did... > > % git log --author=sandra --grep=strprefix > > ... and got: > > commit 26d56a939e9e54e09d46ea6e9678463ac344fa33 > Author: Sandra Loosemore > Date: Tue Aug 18 10:29:54 2015 -0700 > > Fix mis-parsing of hex register numbers in 'T' stop replies. > > 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? -Sandra