svn commit: r1091411 - /subversion/trunk/subversion/tests/cmdline/special_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Apr 12 13:49:40 2011
New Revision: 1091411

URL: http://svn.apache.org/viewvc?rev=1091411&view=rev
Log:
Following up on r1091399, an attempt to fix a posix only test.

* subversion/tests/cmdline/special_tests.py
  (copy_tree_with_symlink): Assume two op-roots for mixed revision copies.

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

Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1091411&r1=1091410&r2=1091411&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Tue Apr 12 13:49:40 2011
@@ -261,8 +261,11 @@ def copy_tree_with_symlink(sbox):
     'A/D/H2/chi' : Item(status='  ', copied='+', wc_rev='-'),
     'A/D/H2/omega' : Item(status='  ', copied='+', wc_rev='-'),
     'A/D/H2/psi' : Item(status='  ', copied='+', wc_rev='-'),
-    'A/D/H2/linktarget' : Item(status='  ', copied='+', wc_rev='-'),
-    'A/D/H2/newfile' : Item(status='  ', copied='+', wc_rev='-'),
+    # linktarget and newfile are from r2, while h2 is from r1.
+    'A/D/H2/linktarget' : Item(status='A ', copied='+', wc_rev='-',
+                               entry_status='  '),
+    'A/D/H2/newfile' : Item(status='A ', copied='+', wc_rev='-',
+                            entry_status='  '),
     })
   svntest.actions.run_and_verify_status(wc_dir, expected_status)