From 8e67d346991ca584ffbe6ad23380c597e10d0ddf Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 10 Jun 2018 10:30:41 +0000 Subject: MFH: r472125 www/waterfox: flatten line endings after r461193 Subversion doesn't allow mixed line endings when svn:eol-style property is set. files/patch-bug1402766 tries to create a new test file, so simply strip carriage-return from lines which is what actually happens on checkout. Originally, the file landed via git-svn which doesn't appear to run sanity checks on dcommit. $ svn cat files/patch-bug1402766 svn: E135000: Inconsistent line ending style Reported by: gjb Approved by: ports-secteam blanket --- www/waterfox/files/patch-bug1402766 | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/www/waterfox/files/patch-bug1402766 b/www/waterfox/files/patch-bug1402766 index f1672e7fa48f..a339af5d1188 100644 --- a/www/waterfox/files/patch-bug1402766 +++ b/www/waterfox/files/patch-bug1402766 @@ -21,25 +21,25 @@ index 000000000000..79313ae1c4d4 --- /dev/null +++ layout/generic/crashtests/1405443.html @@ -0,0 +1,19 @@ -+ -+ -+ -+

-+A -+ -+ -+ -+

++ ++ ++ ++

++A ++ ++ ++ ++

diff --git layout/generic/crashtests/crashtests.list layout/generic/crashtests/crashtests.list index 25c2c32470fc..07cc75ea0f9a 100644 --- layout/generic/crashtests/crashtests.list -- cgit v1.2.3