This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: FYI: GDB 7.10.1 release still planned end of Nov
- From: Joel Brobecker <brobecker at adacore dot com>
- To: Sandra Loosemore <sandra at codesourcery dot com>
- Cc: Pedro Alves <palves at redhat dot com>, gdb-patches at sourceware dot org
- Date: Sun, 15 Nov 2015 09:14:23 -0800
- Subject: Re: FYI: GDB 7.10.1 release still planned end of Nov
- Authentication-results: sourceware.org; auth=none
- References: <20151028164757 dot GC4009 at adacore dot com> <5631005E dot 9070208 at redhat dot com> <20151112184430 dot GA4646 at adacore dot com> <5644E0A4 dot 8020901 at codesourcery dot com> <20151112193849 dot GB4646 at adacore dot com> <56467ED6 dot 9030104 at codesourcery dot 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