subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1434695 - /subversion/trunk/subversion/tests/cmdline/update_tests.py
Date Thu, 17 Jan 2013 14:43:11 GMT
Author: stsp
Date: Thu Jan 17 14:43:11 2013
New Revision: 1434695

URL: http://svn.apache.org/viewvc?rev=1434695&view=rev
Log:
Revert r1434690, which accidentally changed the wrong test.

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=1434695&r1=1434694&r2=1434695&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Jan 17 14:43:11 2013
@@ -5526,7 +5526,7 @@ def update_moved_dir_edited_leaf_del(sbo
                                      'resolve',
                                      '--recursive',
                                      '--accept=mine-conflict', wc_dir)
-  expected_status.tweak('A/B/E', status='  ', treeconflict=None)
+  expected_status.tweak('A/B/E', treeconflict=None)
   expected_status.tweak('A/B/E2/alpha', treeconflict='C')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -6085,7 +6085,6 @@ 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)
 



Mime
View raw message