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

Does this need to be added to the #3668/#3669 revert?

From: Daniel Shahaf <danielsh_at_elego.de>
Date: Fri, 23 Sep 2011 08:06:14 +0300

[[[
Index: subversion/libsvn_client/merge.c
===================================================================
--- subversion/libsvn_client/merge.c (revision 1174351)
+++ subversion/libsvn_client/merge.c (working copy)
@@ -6822,7 +6822,7 @@ do_file_merge(svn_mergeinfo_catalog_t result_catal
                                &inherited, svn_mergeinfo_inherited,
                                merge_b->ra_session1, target_abspath,
                                MAX(revision1, revision2),
- 0, /* Get all implicit mergeinfo */
+ MIN(revision1, revision2),
                                ctx, scratch_pool, iterpool);
 
       if (err)
]]]

This reverts a hunk of r1035894 (the revision merging the
issue-3668-3669 branch to trunk).
Received on 2011-09-23 07:07:06 CEST

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