You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/08/29 19:56:24 UTC
svn commit: r1518733 -
/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
Author: brane
Date: Thu Aug 29 17:56:24 2013
New Revision: 1518733
URL: http://svn.apache.org/r1518733
Log:
Revert the part of r1518577 that modified the JavaHL merge utility test.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
(UtilTests.testFileMerge): Do not use platform-specific newlines in the
expected output. Unlike diff, merge apparently uses the surrounding end-of-line
style when outputting the conflict markers.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java?rev=1518733&r1=1518732&r2=1518733&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java Thu Aug 29 17:56:24 2013
@@ -127,13 +127,13 @@ public class UtilTests extends SVNTests
assertTrue(conflicts);
final byte[] expected = ("1\n2\n3\n4\n\n" +
- "<<<<<<< branch" + NL +
+ "<<<<<<< branch\n" +
"modified\n" +
- "||||||| base" + NL +
+ "||||||| base\n" +
"original\n" +
- "=======" + NL +
+ "=======\n" +
"latest\n" +
- ">>>>>>> local" + NL +
+ ">>>>>>> local\n" +
"\nN-3\nN-2\nN-1\nN\n").getBytes();
Assert.assertArrayEquals(expected, result.toByteArray());
}