GNU bug report logs - #19402
Already-applied patches in 'origin' are automatically reversed

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 19402 in the body.
You can then email your comments to 19402 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mark H Weaver <mhw <at> netris.org>
To: bug-guix <at> gnu.org
Subject: Already-applied patches in 'origin' are automatically reversed
Date: Wed, 17 Dec 2014 19:01:40 -0500

Currently, if a patch that we carry in Guix is taken upstream, and then
we update the package, Guix will automatically reverse the patch without
error.

This behavior delayed my xorg-update work for several hours today (I was
stumped and took a break), and I worry that patches that aren't needed
for successful compilation (e.g. security fixes) could be automatically
undone without anyone noticing.

Perhaps the solution is to pass --force (not --batch) to 'patch'.

What do you think?

      Mark

Message #8 received at 19402 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Mark H Weaver <mhw <at> netris.org>
Cc: 19402 <at> debbugs.gnu.org
Subject: Re: bug#19402: Already-applied patches in 'origin' are automatically
 reversed
Date: Thu, 18 Dec 2014 12:05:25 +0100

Mark H Weaver <mhw <at> netris.org> skribis:

> Currently, if a patch that we carry in Guix is taken upstream, and then
> we update the package, Guix will automatically reverse the patch without
> error.
>
> This behavior delayed my xorg-update work for several hours today (I was
> stumped and took a break), and I worry that patches that aren't needed
> for successful compilation (e.g. security fixes) could be automatically
> undone without anyone noticing.
>
> Perhaps the solution is to pass --force (not --batch) to 'patch'.

I’ve re-read patch(1) and yes, definitely.

Would you like to make this change in ‘core-updates’?

Thanks,
Ludo’.

Message #13 received at 19402-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Mark H Weaver <mhw <at> netris.org>
Cc: 19402-done <at> debbugs.gnu.org
Subject: Re: bug#19402: Already-applied patches in 'origin' are automatically
 reversed
Date: Sat, 27 Dec 2014 00:21:34 +0100

Done in commit 9426440, thanks!

Ludo’.

Message #16 received at 19402 <at> debbugs.gnu.org (full text, mbox):

From: Mark H Weaver <mhw <at> netris.org>
To: 19402 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org
Subject: Re: bug#19402: Already-applied patches in 'origin' are automatically
 reversed
Date: Fri, 26 Dec 2014 20:43:46 -0500

ludo <at> gnu.org (Ludovic Courtès) writes:

> Done in commit 9426440, thanks!

Thanks for fixing it!  The new strictness has already borne fruit.
Turns out we've been reverse applying m4-readlink-EINVAL.patch to our m4
since at least 1fa49a2c4 (September 2013).  Fixed in 6ac8aa3d7.

     Mark

Message #19 received at 19402 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Mark H Weaver <mhw <at> netris.org>
Cc: 19402 <at> debbugs.gnu.org
Subject: Re: bug#19402: Already-applied patches in 'origin' are automatically
 reversed
Date: Sat, 27 Dec 2014 14:14:51 +0100

Mark H Weaver <mhw <at> netris.org> skribis:

> ludo <at> gnu.org (Ludovic Courtès) writes:
>
>> Done in commit 9426440, thanks!
>
> Thanks for fixing it!  The new strictness has already borne fruit.
> Turns out we've been reverse applying m4-readlink-EINVAL.patch to our m4
> since at least 1fa49a2c4 (September 2013).  Fixed in 6ac8aa3d7.

Ouch.  Using --force was really a good idea.

Thanks for the quick fix,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.