From owner-svn-ports-tags@freebsd.org  Sun Jun 10 10:52:36 2018
Return-Path: <owner-svn-ports-tags@freebsd.org>
Delivered-To: svn-ports-tags@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D13041013996;
 Sun, 10 Jun 2018 10:52:36 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A8177B6B3;
 Sun, 10 Jun 2018 10:52:36 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id 699881D7D8; Sun, 10 Jun 2018 10:52:36 +0000 (UTC)
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
References: <201806061517.w56FHCoZ061535@repo.freebsd.org>
 <20180606152238.GA84135@FreeBSD.org>
Date: Sun, 10 Jun 2018 12:52:30 +0200
In-Reply-To: <20180606152238.GA84135@FreeBSD.org> (Glen Barber's message of
 "Wed, 6 Jun 2018 15:22:38 +0000")
Message-ID: <wov6-52xd-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-ports-tags@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for all the tags of the ports tree
 <svn-ports-tags.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-tags>, 
 <mailto:svn-ports-tags-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-tags/>
List-Post: <mailto:svn-ports-tags@freebsd.org>
List-Help: <mailto:svn-ports-tags-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-tags>,
 <mailto:svn-ports-tags-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jun 2018 10:52:37 -0000

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.