[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] merge_tracking merge_tests.py testcase failures fix for delete_file_and_dir

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-07-07 16:28:59 CEST

Garrett Rooney wrote:
>
> 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
>
Yes more proper one would be to 'svn revert'. (Was wondering how to
revert changes to one property alone!. Anyway I can revert the workarea
itself.
Thanks for finding that out.

Please 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 revert -R B2_path' to make subsequent 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,12 @@
                                        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.
+ #revert the B2_path which should retrieve the svn:mergeinfo to orig value
+ #so that subsequent force merge would work.
+ svntest.actions.run_and_verify_svn(B2_path, None, [],
+ 'revert', '-R', B2_path)
   expected_output = wc.State(B2_path, {
     'E' : Item(status='D '),
     'E/alpha' : Item(status='D '),

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 16:28:09 2006

This is an archived mail posted to the Subversion Dev mailing list.