On 7/7/06, Kamesh Jayachandran <kamesh@collab.net> wrote:
> Hi All,
> Find the attached patch.
>
> With regards
> Kamesh Jayachandran
> [[[
> Patch by: Kamesh Jayachandran <kamesh@collab.net>
>
> Even though the given merge leads to 'Skip' svn:mergeinfo is recorded.
> This causes subsequent force merge to fail.
>
> * subversion/tests/cmdline/merge_tests.py
> (delete_file_and_dir):
> 'svn pd svn:mergeinfo' to make subseuent forced merges to succeed.
> ]]]
>
>
>
> Index: subversion/tests/cmdline/merge_tests.py
> ===================================================================
> --- subversion/tests/cmdline/merge_tests.py (revision 20465)
> +++ subversion/tests/cmdline/merge_tests.py (working copy)
> @@ -626,6 +626,11 @@
> expected_status,
> expected_skip)
>
> + #subversion/libsvn_client/diff.c:do_merge has no way of knowing
> + #if at all any changes are caused by this merge.
> + #delete the svn:mergeinfo so that subsequent force merge would work.
> + svntest.actions.run_and_verify_svn(B2_path, None, [],
> + 'pd', SVN_PROP_MERGE_INFO, B2_path)
> expected_output = wc.State(B2_path, {
> 'E' : Item(status='D '),
> 'E/alpha' : Item(status='D '),
Uhh, maybe it's just me, but this seems like you're working around the
actual problem here. Why should we have to delete the mergeinfo prop?
We don't expect users to do that, do we?
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 15:58:51 2006