svn commit: r1836406 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

[st...@apache.org]

Author: stsp
Date: Sat Jul 21 13:22:05 2018
New Revision: 1836406

URL: http://svn.apache.org/viewvc?rev=1836406&view=rev
Log:
Fix wrong expectations of an XFAIL conflict resolver test.

* subversion/tests/libsvn_client/conflict-tests.c
  (test_cherry_pick_post_move_edit): The cherry-pick merge as run by this
   test results in a text conflict. Update test expectations accordingly.

Modified:
    subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1836406&r1=1836405&r2=1836406&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Sat Jul 21 13:22:05 2018
@@ -4986,7 +4986,14 @@ test_cherry_pick_post_move_edit(const sv
 
   /* And "A1/mu" should have expected contents. */
   SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool));
-  SVN_TEST_STRING_ASSERT(buf->data, "More modified content." APR_EOL_STR);
+  SVN_TEST_STRING_ASSERT(buf->data, 
+    "<<<<<<< .working" APR_EOL_STR
+    "This is the file 'mu'." APR_EOL_STR
+    "||||||| .old" APR_EOL_STR
+    "Modified content." APR_EOL_STR
+    "=======" APR_EOL_STR
+    "More modified content." APR_EOL_STR
+    ">>>>>>> .new" APR_EOL_STR);
 
   return SVN_NO_ERROR;
 }