svn commit: r955327 - /subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py

[pb...@apache.org]

Author: pburba
Date: Wed Jun 16 17:59:55 2010
New Revision: 955327

URL: http://svn.apache.org/viewvc?rev=955327&view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py

  (added_subtrees_with_mergeinfo_break_reintegrate): Move comment about
   XFailing reintegrate to the reintegrate attempt which is actually failing.


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

Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=955327&r1=955326&r2=955327&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Jun 16 17:59:55 2010
@@ -1936,6 +1936,17 @@ def added_subtrees_with_mergeinfo_break_
 
   # r14 - Reintegrate A_COPY to A.
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  # Currently this fails with:
+  #
+  #  >svn merge ^^/A_COPY A --reintegrate
+  #  svn: Reintegrate can only be used if revisions 2 through 13 were
+  #  previously merged from file:///D:/SVN/src-trunk/Release/subversion/
+  #  tests/cmdline/svn-test-work/repositories/merge_reintegrate_tests-13/A
+  #  to the reintegrate source, but this is not the case:
+  #    A_COPY/C/nu
+  #      Missing ranges: /A/C/nu:9,11
+  #
+  # Marking this test as XFail until this issue is fixed.
   svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
                                      'merge', '--reintegrate',
                                      sbox.repo_url + '/A_COPY', A_path)
@@ -1976,18 +1987,6 @@ def added_subtrees_with_mergeinfo_break_
   # Reintegrate A_COPY back to A.  We just synced A_COPY with A, so this
   # should work.  The only text change should be the change made to
   # A_COPY/B/lambda in r17 after the new A_COPY was created.
-  #
-  # Currently this fails with:
-  #
-  #  >svn merge ^^/A_COPY A --reintegrate
-  #  svn: Reintegrate can only be used if revisions 2 through 13 were
-  #  previously merged from file:///D:/SVN/src-trunk/Release/subversion/
-  #  tests/cmdline/svn-test-work/repositories/merge_reintegrate_tests-13/A
-  #  to the reintegrate source, but this is not the case:
-  #    A_COPY/C/nu
-  #      Missing ranges: /A/C/nu:9,11
-  #
-  # Marking this test as XFail until this issue is fixed.
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
   expected_output = wc.State(A_path, {
     ''         : Item(status=' U'),