https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211805
--- Comment #18 from Larry Rosenman ---
because I was under the impression (perhaps misguided) that you needed to merge
ALL revisions of a port since the branch.
--
You are receiving this mail because:
You are on the CC list for the bug.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211805
--- Comment #17 from Jan Beich ---
Why ports r451721 has anything to do with ports r452901? Both touch
PORTREVISION, so merge conflict is expected. Subversion presents several
options to resolve conflicts. If you didn't know how this was su
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211805
--- Comment #16 from Mark Linimon ---
(In reply to Larry Rosenman from comment #14)
OK, I was unaware of how that script works. I have commented the line out, and
that should be good enough to allow an MFC of the latest revision by itself
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211805
--- Comment #15 from commit-h...@freebsd.org ---
A commit references this bug:
Author: linimon
Date: Fri Oct 27 16:45:01 UTC 2017
New revision: 453014
URL: https://svnweb.freebsd.org/changeset/ports/453014
Log:
Temporarily uncomment the
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211805
--- Comment #14 from Larry Rosenman ---
The issue is getting the Tools/scripts/mfh scropt to DTRT, as it'll want to
push that big commit to quarterly.
--
You are receiving this mail because:
You are on the CC list for the bug.
___
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211805
--- Comment #13 from Mark Linimon ---
(In reply to Larry Rosenman from comment #12)
IIUC the additional line will only be evaluated in an environment where ARCH is
'armv7'. So if that is not the case, the statement should have no effect.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223071
--- Comment #15 from commit-h...@freebsd.org ---
A commit references this bug:
Author: mat
Date: Fri Oct 27 12:19:20 UTC 2017
New revision: 452975
URL: https://svnweb.freebsd.org/changeset/ports/452975
Log:
Fix options usage.
You cann
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223071
--- Comment #14 from commit-h...@freebsd.org ---
A commit references this bug:
Author: mat
Date: Fri Oct 27 12:19:17 UTC 2017
New revision: 452974
URL: https://svnweb.freebsd.org/changeset/ports/452974
Log:
Fix options defined more than