Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Nov 2015 03:12:22 +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-B7EHRHYAqr@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 #6 from Jan Beich <jbeich@FreeBSD.org> ---
Comment on attachment 163405
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=163405
proposed patch to smart_makepatch.sh

Thanks. makepatch no longer inserts junk into patches.

(In reply to John Marino from comment #4)
> some of the "local var=$(some cmd)" didn't work

Bug 166771? I don't see "locale: 2: bad variable name" even on FreeBSD 9.3R.

(In reply to John Marino from comment #4)
> ... the changes get combined and this is expected

... and any hunks applied before are *lost* because .orig file(s) now points to
a patched version(s). If makepatch cannot avoid screwing up multi-file patches
I cannot recommend it to anyone with clear conscience e.g., in bug 203353.

One way to fix this issue is to employ a VCS to record changes then export them
back. Dropping (any) timestamps in the process would be a feature, not a bug
(less noise in commits).

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