Author: stsp
Date: Sun Oct 16 18:17:33 2016
New Revision: 1765181
URL: http://svn.apache.org/viewvc?rev=1765181&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(test_merge_incoming_added_dir_replace_and_merge2): Fix sandbox name.
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=1765181&r1=1765180&r2=1765181&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Sun Oct 16
18:17:33 2016
@@ -1217,9 +1217,8 @@ test_merge_incoming_added_dir_replace_an
svn_opt_revision_t opt_rev;
svn_test__sandbox_t *b = apr_palloc(pool, sizeof(*b));
- SVN_ERR(svn_test__sandbox_create(b,
-
"merge_incoming_added_dir_replace_and_merge",
- opts, pool));
+ SVN_ERR(svn_test__sandbox_create(
+ b, "merge_incoming_added_dir_replace_and_merge2", opts, pool));
SVN_ERR(create_wc_with_dir_add_vs_dir_add_merge_conflict(b, FALSE, FALSE,
TRUE));
