subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1837821 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Date Fri, 10 Aug 2018 16:10:10 GMT
Author: stsp
Date: Fri Aug 10 16:10:09 2018
New Revision: 1837821

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

* subversion/test/libsvn_client/conflicts-test.c
  (test_cherry_pick_post_move_edit_dir): Fix errors in paths used by
   post-resolution checks.

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=1837821&r1=1837820&r2=1837821&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Fri Aug 10 16:10:09 2018
@@ -5673,12 +5673,12 @@ test_cherry_pick_post_move_edit_dir(cons
 
   /* The node "B-moved" should no longer exist. */
   SVN_TEST_ASSERT_ERROR(svn_client_conflict_get(&conflict,
-                                                sbox_wc_path(b, "A/B-moved"),
+                                                sbox_wc_path(b, "A1/B-moved"),
                                                 ctx, pool, pool),
                         SVN_ERR_WC_PATH_NOT_FOUND);
 
-  /* And "A/B/lambda" should have expected contents. */
-  SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A/B/lambda"), pool));
+  /* And "A1/B/lambda" should have expected contents. */
+  SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/B/lambda"), pool));
   SVN_TEST_STRING_ASSERT(buf->data, "Modified content." APR_EOL_STR);
 
   return SVN_NO_ERROR;



Mime
View raw message