On Fri, Apr 9, 2010 at 11:46, <rhuij...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr 9
> 15:46:17 2010
> @@ -18792,7 +18792,7 @@ def reintegrate_with_subtree_merges(sbox
> 'D/H/omega' : Item("New content"),
> })
> expected_A_skip = wc.State(A_COPY_path, {})
> - svntest.actions.run_and_verify_merge(A_path, None, None,
> + svntest.actions.run_and_verify_svn(A_path, None, None,
> sbox.repo_url + '/A_COPY', None,
> expected_output,
> expected_mergeinfo_output,
What's this?
>...
Cheers,
-g
