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

[ju...@apache.org]

Author: julianfoad
Date: Fri Aug 10 22:38:15 2012
New Revision: 1371835

URL: http://svn.apache.org/viewvc?rev=1371835&view=rev
Log:
Adjust the expected merge notification in merge_tests.py 78 to account for a
harmless change due to the 'symmetric merge' code: issue #4217.  Remove the
XFail.

* subversion/tests/cmdline/merge_tests.py
  (dont_merge_revs_into_subtree_that_predate_it): Adjust expectations and
    remove XFail.

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=1371835&r1=1371834&r2=1371835&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Aug 10 22:38:15 2012
@@ -11060,7 +11060,6 @@ def reverse_merge_away_all_mergeinfo(sbo
 # merge'.  Specifically see
 # http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5
 @SkipUnless(server_has_mergeinfo)
-@XFail()
 @Issues(3138,3067,4217)
 def dont_merge_revs_into_subtree_that_predate_it(sbox):
   "dont merge revs into a subtree that predate it"
@@ -11194,7 +11193,9 @@ def dont_merge_revs_into_subtree_that_pr
   svntest.actions.run_and_verify_svn(
     None,
     expected_merge_output(
-      [[6,9]], ['U    ' + os.path.join(H_COPY_path, "psi") + '\n',
+      [[7,9],  # Merge notification
+       [6,9]], # Mergeinfo notification
+               ['U    ' + os.path.join(H_COPY_path, "psi") + '\n',
                 'D    ' + os.path.join(H_COPY_path, "nu") + '\n',
                 ' U   ' + H_COPY_path + '\n',]),
     [], 'merge', sbox.repo_url + '/A/D/H', H_COPY_path, '--force')