On Thu, May 8, 2008 at 7:54 AM, <kameshj_at_tigris.org> wrote:
> Author: kameshj
> Date: Thu May 8 04:54:31 2008
> New Revision: 31086
>
> Log:
> Fix the XFail test expectations as per fix to issue 3157(r31075).
>
> * subversion/tests/cmdline/merge_tests.py
> (dont_merge_revs_into_subtree_that_predate_it): Fix the expectations about
> /H_COPY and H_COPY/nu.
>
> Modified:
> trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=31086&r1=31085&r2=31086
> ==============================================================================
> --- trunk/subversion/tests/cmdline/merge_tests.py Thu May 8 04:25:27 2008 (r31085)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Thu May 8 04:54:31 2008 (r31086)
> @@ -11145,11 +11145,14 @@ def dont_merge_revs_into_subtree_that_pr
> # Check the status after the merge. The mergeinfo set on 'H_COPY/nu set
> # by the first merge should elide.
> expected_status.tweak('H_COPY', status=' M')
> - expected_status.tweak('H_COPY/nu', 'H_COPY/psi', status='M ')
> + expected_status.tweak('H_COPY/psi', status='M ')
> + expected_status.tweak('H_COPY/nu', status='MM')
> svntest.actions.run_and_verify_status(wc_dir, expected_status)
> expected_props = svntest.verify.UnorderedOutput(
> ["Properties on '" + H_COPY_path + "':\n",
> - " " + SVN_PROP_MERGEINFO + " : /A/D/H:2,6-8\n"])
> + " " + SVN_PROP_MERGEINFO + " : /A/D/H:6-8\n",
> + "Properties on '" + nu_COPY_path + "':\n",
> + " " + SVN_PROP_MERGEINFO + " : /A/D/H/nu:2,6-8\n"])
Hi Kamesh,
Shouldn't r2 be gone entirely from any mergeinfo now that issue #3157
is fixed? It is from the natural history of 'H_COPY' so should never
appear explicitly.
Also, why should 'H_COPY/nu' have any explicit mergeinfo on it at the
end of this test? The final merge of the test a cherry harvest all
eligible revisions from 'A/D/H' to 'H_COPY' so no subtree of 'H_COPY'
should have any explicit mergeinfo right?
Paul
> svntest.actions.run_and_verify_svn(None,
> expected_props, [],
> 'pl', '-vR', wc_dir)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-08 17:42:27 CEST