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

[pb...@apache.org]

Author: pburba
Date: Wed Jun 16 19:18:48 2010
New Revision: 955352

URL: http://svn.apache.org/viewvc?rev=955352&view=rev
Log:
Follow-up to r953878: Another adjustment of test for issue #3654 to account
for trunk vs. 1.6.x mergeinfo recording behavior.

* subversion/tests/cmdline/merge_reintegrate_tests.py

  (added_subtrees_with_mergeinfo_break_reintegrate): Since issue #3591 was
   fixed in r917822, we don't expect reintegrate merges to unconditionally
   update mergeinfo for all subtrees.  Rather the subtrees are only updated
   if the reintegrate affects them.  This test, originally written against
   1.6.x, expected the unconditional recording of subtree mergeinfo; this
   change fixes that.



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=955352&r1=955351&r2=955352&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Wed Jun 16 19:18:48 2010
@@ -2044,7 +2044,7 @@ def added_subtrees_with_mergeinfo_break_
     'C'         : Item(),
     'C/nu'      : Item("Trunk work on nu.\n",
                        props={SVN_PROP_MERGEINFO :
-                              '/A_COPY/C/nu:2-13,16-18\n'
+                              '/A_COPY/C/nu:16-18\n'
                               '/A_COPY_2/C/nu:10'}), # <-- From cyclic
                                                      # merge in r11
     'D'         : Item(),