You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/03/21 18:39:45 UTC
svn commit: r1459419 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: julianfoad
Date: Thu Mar 21 17:39:45 2013
New Revision: 1459419
URL: http://svn.apache.org/r1459419
Log:
* subversion/tests/cmdline/merge_tests.py
(conflicted_split_merge_with_resolve): Update the WC in this test before
creating a branch, as a single-rev copy is less confusing to debug.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1459419&r1=1459418&r2=1459419&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Mar 21 17:39:45 2013
@@ -18824,6 +18824,7 @@ def conflicted_split_merge_with_resolve(
sbox.simple_commit()
# r3: branch
+ sbox.simple_update()
sbox.simple_copy(trunk, branch)
sbox.simple_commit()