On Fri, Jun 17, 2016 at 06:59:23PM +0000, ng0 wrote: > On 2016-06-17(01:43:02-0400), Leo Famulari wrote: > > On Fri, Jun 17, 2016 at 05:02:44PM +0200, Ludovic Courtès wrote: > > > Efraim Flashner <[email protected]> skribis: > > > > > > > On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote: > > > >> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote: > > > >> > * gnu/packages/gnupg.scm (libgcrypt): Update to 1.7.1 > > > >> > > > >> This looks good to me. What branch should it go on? > > > >> > > > > > > > > either core-updates or core-updates-next > > > > > > The latter please. :-) > > > > Okay, in that case, can you rebase it on core-updates, ng0? Otherwise is > > won't apply cleanly due to trying to upgrade from 1.6.5 instad of 1.7.0. > > > > This should be relatively easy when I have the gnupg branch still around, > otherwise I'll recreate it. > > With the wording familiar to me yet sometimes not good to comprehend even > when I hear and parse it correctly when talking: > I should rebase the commit on the branch > `core-updates` which currently is at version 1.6.5?
I think your copy of core-updates needs to be updated. I pushed your patch "gnu: libgcrypt: Update to 1.7.0" as 81068f178 to it in April ;) All you need to do is get the latest core-updates, and then re-do this patch on that branch, so that it updates from 1.7.0 instead of 1.6.5. You don't need to do anything with gnupg.
