subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1066414 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Date Wed, 02 Feb 2011 11:13:27 GMT
Author: rhuijben
Date: Wed Feb  2 11:13:26 2011
New Revision: 1066414

URL: http://svn.apache.org/viewvc?rev=1066414&view=rev
Log:
* subversion/tests/cmdline/tree_conflict_tests.py
  (up_add_onto_add_revert): Update expected status to a replacement. The file
    case of this XFail test is already fixed (and shows 'R'), but the directory
    case is not.

Modified:
    subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1066414&r1=1066413&r2=1066414&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Wed Feb  2 11:13:26 2011
@@ -997,8 +997,8 @@ def up_add_onto_add_revert(sbox):
 
   expected_status = get_virginal_state(wc2_dir, 2)
   expected_status.add({
-    'newfile' : Item(status='A ', copied='+', treeconflict='C', wc_rev='-'),
-    'NewDir'  : Item(status='A ', copied='+', treeconflict='C', wc_rev='-'),
+    'newfile' : Item(status='R ', copied='+', treeconflict='C', wc_rev='-'),
+    'NewDir'  : Item(status='R ', copied='+', treeconflict='C', wc_rev='-'),
     })
 
   run_and_verify_update(wc2_dir,



Mime
View raw message