You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/01/17 15:47:21 UTC
svn commit: r1434698 -
/subversion/trunk/subversion/tests/cmdline/update_tests.py
Author: stsp
Date: Thu Jan 17 14:47:20 2013
New Revision: 1434698
URL: http://svn.apache.org/viewvc?rev=1434698&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
(break_moved_dir_edited_leaf_del): Adjust test expectations. After reverting
the deleted A/B/E, E itself and its child beta are no longer deleted.
Modified:
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1434698&r1=1434697&r2=1434698&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Jan 17 14:47:20 2013
@@ -6085,6 +6085,7 @@ def break_moved_dir_edited_leaf_del(sbox
'resolve', '--recursive',
'--accept=theirs-conflict', wc_dir)
expected_status.tweak('A/B/E', status=' ', treeconflict=None, moved_to=None)
+ expected_status.tweak('A/B/E/beta', status=' ')
expected_status.tweak('A/B/E2', moved_from=None)
svntest.actions.run_and_verify_status(wc_dir, expected_status)