Date: Sun, 10 Jun 2018 12:52:30 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Glen Barber <gjb@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-tags@freebsd.org Subject: Re: svn commit: r471851 - in tags/RELEASE_11_2_0: . www/waterfox/files Message-ID: <wov6-52xd-wny@FreeBSD.org> In-Reply-To: <20180606152238.GA84135@FreeBSD.org> (Glen Barber's message of "Wed, 6 Jun 2018 15:22:38 %2B0000") References: <201806061517.w56FHCoZ061535@repo.freebsd.org> <20180606152238.GA84135@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Glen Barber <gjb@FreeBSD.org> writes: > On Wed, Jun 06, 2018 at 03:17:12PM +0000, Glen Barber wrote: > >> Author: gjb >> Date: Wed Jun 6 15:17:12 2018 >> New Revision: 471851 >> URL: https://svnweb.freebsd.org/changeset/ports/471851 >> >> Log: >> Copy branches/2018Q2@471740 to tags/RELEASE_11_2_0 as part >> of the upcoming 11.2-RELEASE. >> >> Approved by: portmgr (antoine) >> Sponsored by: The FreeBSD Foundation >> >> Added: >> tags/RELEASE_11_2_0/ >> - copied from r471740, branches/2018Q2/ >> Modified: >> tags/RELEASE_11_2_0/www/waterfox/files/patch-bug1402766 >> >> Modified: tags/RELEASE_11_2_0/www/waterfox/files/patch-bug1402766 > > I failed to note in the commit log that there is something malformed in > this specific file with line endings. For example: > > % svn cat svn+ssh://repo.freebsd.org/ports/head/www/waterfox/files/patch-bug1402766 > commit fd42606e30e4 https://github.com/mozilla/gecko-dev/commit/fd42606e30e4.patch is the source but generated via "git log -p --stat --no-prefix --abbrev=12". > diff --git layout/generic/crashtests/1405443.html layout/generic/crashtests/1405443.html > new file mode 100644 > index 000000000000..79313ae1c4d4 > --- /dev/null > +++ layout/generic/crashtests/1405443.html > @@ -0,0 +1,19 @@ > +<style>svn: E135000: Inconsistent line ending style Git doesn't care about line endings but can be configured to auto-correct them. "git svn dcommit" bypassed sanity check Subversion uses for svn:eol-style, so the repo had mixed line endings. However, "svn checkout" appears to auto-correct those without actually warning the checked out file doesn't match what's in the repo. svn:eol-style churn in files/patch-* is notorious PITA from portmgr@ policy. Many ports end up using USES=dos2unix just to work around it. And patches wouldn't apply if "native" expands to "CRLF", anyway. > > The same issue exists in both head and the 2018Q2 branch, and the copy > changed the inconsistent line endings. Thanks. Fixed in r472125.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?wov6-52xd-wny>