Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Joel Brobecker <brobecker@adacore.com>
To: Sandra Loosemore <sandra@codesourcery.com>
Cc: Pedro Alves <palves@redhat.com>, gdb-patches@sourceware.org
Subject: Re: FYI: GDB 7.10.1 release still planned end of Nov
Date: Sun, 15 Nov 2015 17:14:00 -0000	[thread overview]
Message-ID: <20151115171423.GA4009@adacore.com> (raw)
In-Reply-To: <56467ED6.9030104@codesourcery.com>

> >   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


      parent reply	other threads:[~2015-11-15 17:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-28 19:36 Joel Brobecker
2015-10-28 19:46 ` Pedro Alves
2015-11-12 18:44   ` Joel Brobecker
2015-11-12 18:55     ` Sandra Loosemore
2015-11-12 19:38       ` Joel Brobecker
2015-11-14  0:23         ` Sandra Loosemore
2015-11-14  8:58           ` Andreas Schwab
2015-11-15 17:14           ` Joel Brobecker [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151115171423.GA4009@adacore.com \
    --to=brobecker@adacore.com \
    --cc=gdb-patches@sourceware.org \
    --cc=palves@redhat.com \
    --cc=sandra@codesourcery.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox