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

[PATCH] 'svn merge' should not lose indirect merge information

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-07-07 19:57:07 CEST

Hi,

    Am sending this fix as a follow-up to the conversation at
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117481

[[[
'svn merge' should not lose indirect merge information.

(In branches/merge-tracking)

* subversion/libsvn_client/diff.c:
   (do_merge): Obtain the latest mergeinfo on the target wc
    before merging and updating it with the current merge's info.
]]]

Regards,
Madan.

Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 20465)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1931,6 +1931,11 @@
       SVN_ERR(reporter->finish_report(report_baton, pool));
     }
 
+ /* Get the latest mergeinfo of the target_wcpath, before updating
+ it with the current merge's information */
+ SVN_ERR(parse_merge_info(&target_mergeinfo, target_wcpath, adm_access, ctx,
+ pool));
+
   if (!merge_b->dry_run && remaining_ranges->nelts > 0)
     SVN_ERR(update_wc_merge_info(target_wcpath, target_mergeinfo, rel_path,
                                  remaining_ranges, is_revert, adm_access,

'svn merge' should not lose indirect merge information.

(In branches/merge-tracking)

* subversion/libsvn_client/diff.c:
  (do_merge): Obtain the latest mergeinfo on the target wc
   before merging and updating it with the current merge's info.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 19:27:20 2006

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