Author: pburba Date: Mon Jun 14 14:48:56 2010 New Revision: 954488 URL: http://svn.apache.org/viewvc?rev=954488&view=rev Log: On the 1.6.x-issue3654 branch: Adjust a merge test's expectations.
* subversion/tests/cmdline/merge_tests.py (merge_to_target_with_copied_children): This is the one test in the 1.6.x suite that actually expected a merge to not update subtree mergeinfo. With the changes made in http://svn.apache.org/viewvc?view=revision&revision=953904 however, all subtrees get updated with mergeinfo to describe the merge. Modified: subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py Modified: subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py?rev=954488&r1=954487&r2=954488&view=diff ============================================================================== --- subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py (original) +++ subversion/branches/1.6.x-issue3654/subversion/tests/cmdline/merge_tests.py Mon Jun 14 14:48:56 2010 @@ -5320,7 +5320,8 @@ def merge_to_target_with_copied_children 'pi' : Item("This is the file 'pi'.\n"), 'rho' : Item("New content"), 'rho_copy' : Item("New content", - props={SVN_PROP_MERGEINFO : '/A/D/G/rho:4'}), + props={SVN_PROP_MERGEINFO : + '/A/D/G/rho:4\n/A/D/G/rho_copy:4-5'}), 'tau' : Item("This is the file 'tau'.\n"), }) expected_skip = wc.State(G_COPY_path, { })
