svn commit: r1483927 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[pb...@apache.org]

Author: pburba
Date: Fri May 17 17:53:48 2013
New Revision: 1483927

URL: http://svn.apache.org/r1483927
Log:
Minor correction to test for issue #4367 'merge to shallow WC, repeat merge
to infinite depth WC is broken'.

* subversion/tests/cmdline/merge_tests.py
  (merge_to_empty_target_merge_to_infinite_target): Adjust the expected
   output of the final merge to use the new "prev_status" for a path that
   is notified twice -- i.e. it's added on the first editor drive and 
   deleted on the second drive.

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

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1483927&r1=1483926&r2=1483927&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri May 17 17:53:48 2013
@@ -19076,9 +19076,8 @@ def merge_to_empty_target_merge_to_infin
   expected_output = wc.State(A_COPY_path, {
     'B/B1'              : Item(status='A '),
     'B/B1/test.txt'     : Item(status='A '),
-    'B/B1/B1a'          : Item(status='A '),
+    'B/B1/B1a'          : Item(status='D ', prev_status='A '),
     'B/B1/B1a/test.txt' : Item(status='A '),
-    'B/B1/B1a'          : Item(status='D '),
     })
   expected_mergeinfo_output = wc.State(A_COPY_path, {
     ''  : Item(status=' U'),