Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Jun 2018 10:24:00 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r472125 - head/www/waterfox/files
Message-ID:  <201806101024.w5AAO0UR028064@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jun 10 10:24:00 2018
New Revision: 472125
URL: https://svnweb.freebsd.org/changeset/ports/472125

Log:
  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

Modified:
  head/www/waterfox/files/patch-bug1402766

Modified: head/www/waterfox/files/patch-bug1402766
==============================================================================
--- head/www/waterfox/files/patch-bug1402766	Sun Jun 10 10:02:55 2018	(r472124)
+++ head/www/waterfox/files/patch-bug1402766	Sun Jun 10 10:24:00 2018	(r472125)
@@ -21,25 +21,25 @@ index 000000000000..79313ae1c4d4
 --- /dev/null
 +++ layout/generic/crashtests/1405443.html
 @@ -0,0 +1,19 @@
-+<style>
-+#htmlvar00009 { page-break-inside: avoid; }
-+* { padding-left: 1vw; border-right: solid green 3em; }
-+#htmlvar00001 { columns: 1px; )
-+</style>
-+<script>
-+function jsfuzzer() {
-+try { htmlvar00009.appendChild(htmlvar00013); } catch(e) { }
-+try { var var00143 = htmlvar00009.x; } catch(e) { }
-+try { htmlvar00009.appendChild(document.createElement("table").createCaption()); } catch(e) { }
-+}
-+</script>
-+<body onload=jsfuzzer()>
-+<dl id="htmlvar00001">
-+A
-+<img id="htmlvar00009" align="left"></img>
-+<menu id="htmlvar00013">
-+<menuitem>
-+<hr>
++<style>
++#htmlvar00009 { page-break-inside: avoid; }
++* { padding-left: 1vw; border-right: solid green 3em; }
++#htmlvar00001 { columns: 1px; )
++</style>
++<script>
++function jsfuzzer() {
++try { htmlvar00009.appendChild(htmlvar00013); } catch(e) { }
++try { var var00143 = htmlvar00009.x; } catch(e) { }
++try { htmlvar00009.appendChild(document.createElement("table").createCaption()); } catch(e) { }
++}
++</script>
++<body onload=jsfuzzer()>
++<dl id="htmlvar00001">
++A
++<img id="htmlvar00009" align="left"></img>
++<menu id="htmlvar00013">
++<menuitem>
++<hr>
 diff --git layout/generic/crashtests/crashtests.list layout/generic/crashtests/crashtests.list
 index 25c2c32470fc..07cc75ea0f9a 100644
 --- layout/generic/crashtests/crashtests.list



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806101024.w5AAO0UR028064>