Date: Sun, 22 Nov 2015 09:28:43 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 204725] Mk/bsd.port.mk: makepatch inserts context junk after r401709 Message-ID: <bug-204725-13-QnvnjzK7A2@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-204725-13@https.bugs.freebsd.org/bugzilla/> References: <bug-204725-13@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204725 --- Comment #10 from John Marino <marino@FreeBSD.org> --- (In reply to John Marino from comment #7) Ah, I get what you mean by this now: ".. and any hunks applied before are *lost* because .orig file(s) now points to a patched version(s)" The first patch to File X creates the .orig file and the second patch to File X will overwrite it, thus the resulting patch only includes the last applied change. This will be difficult to fix because it's happening in the do-patch phase, well before makepatch comes in. It's actually another reason to avoid splitting a patch into multiple files. Maintainers have the same problem if they generate their patches manually (and the previous version of makepatch also did the the same thing) The do-patch step would have to be modified in a predictable way (e.g. on the first patch, cp <file>.orig to <file>.orig.1st if <file>.orig.1st does not exist. Then makepatch can mv any <file>.orig.1st back to <file>.orig before running. -- You are receiving this mail because: You are on the CC list for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-204725-13-QnvnjzK7A2>