svn commit: r1456385 - /subversion/trunk/subversion/tests/cmdline/update_tests.py

[ph...@apache.org]

Author: philip
Date: Thu Mar 14 10:34:17 2013
New Revision: 1456385

URL: http://svn.apache.org/r1456385
Log:
Remove XFail from a test by resolving with --accept=working rather
than --accept=theirs-conflict.

* subversion/tests/cmdline/update_tests.py
  (break_moved_replaced_dir): Resolve using working, expect conflict to
   be resolved, remove XFail marking.

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=1456385&r1=1456384&r2=1456385&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Mar 14 10:34:17 2013
@@ -6128,7 +6128,6 @@ def break_moved_dir_edited_leaf_del(sbox
   expected_status.tweak('A/B/E2', moved_from=None)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-@XFail()
 @Issue(3144,3630)
 def break_moved_replaced_dir(sbox):
   "break local move of dir plus replace"
@@ -6182,13 +6181,14 @@ def break_moved_replaced_dir(sbox):
                                         None, None, None,
                                         None, None, 1)
 
-  # Now resolve the conflict, using --accept=theirs-conflict.
+  # Now resolve the conflict, using --accept=working
   # This should break the move of A/B/E to A/B/E2, leaving A/B/E2
   # as a copy. A/B/E is not reverted.
   svntest.actions.run_and_verify_svn("resolve failed", None, [],
                                      'resolve', '--recursive',
-                                     '--accept=theirs-conflict', wc_dir)
+                                     '--accept=working', wc_dir)
   expected_status.tweak('A/B/E2', moved_from=None)
+  expected_status.tweak('A/B/E', treeconflict=None, moved_to=None)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
 @Issue(4295)