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

[pb...@apache.org]

Author: pburba
Date: Fri May 21 20:53:34 2010
New Revision: 947169

URL: http://svn.apache.org/viewvc?rev=947169&view=rev
Log:
Tweak an XFailing merge test to reflect expected issue #3642 behavior.

* subversion/tests/cmdline/merge_tests.py

  (merge_target_with_non_inheritable_mergeinfo): During a depth=immediates
   merge, immediate directory children of the merge target should get
   non-inheritable mergeinfo describing the merge *if* a depth=infinity
   merge would have affected that child.

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=947169&r1=947168&r2=947169&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri May 21 20:53:34 2010
@@ -9456,8 +9456,14 @@ def merge_target_with_non_inheritable_me
   expected_output = wc.State(A_COPY_B_path, {
     'lambda' : Item(status='U '),
     })
+  # Issue #3642 http://subversion.tigris.org/issues/show_bug.cgi?id=3642
+  #
+  # We don't expect A_COPY/B/F to have mergeinfo recorded on it because
+  # not only is it unaffected by the merge at depth immediates, it could
+  # never be affected by the merge, regardless of depth.  
   expected_mergeinfo_output = wc.State(A_COPY_B_path, {
-    ''  : Item(status=' U'),
+    ''   : Item(status=' U'),
+    'E'  : Item(status=' U'),
     })
   expected_elision_output = wc.State(A_COPY_B_path, {
     })
@@ -9472,7 +9478,7 @@ def merge_target_with_non_inheritable_me
   expected_status = wc.State(A_COPY_B_path, {
     ''         : Item(status=' M', wc_rev=2),
     'lambda'   : Item(status='M ', wc_rev=2),
-    'F'        : Item(status=' M', wc_rev=2),
+    'F'        : Item(status='  ', wc_rev=2),
     'E'        : Item(status=' M', wc_rev=2),
     'E/alpha'  : Item(status='  ', wc_rev=2),
     'E/beta'   : Item(status='  ', wc_rev=2),