Author: pburba
Date: Fri Sep 23 14:23:20 2011
New Revision: 1174797
URL: http://svn.apache.org/viewvc?rev=1174797&view=rev
Log:
Revert a small part of the issue #3668 and issue #3669 fixes that escaped
the reversion of those same fixes in r1173425 -- see
http://svn.haxx.se/dev/archive-2011-09/0495.shtml
* subversion/libsvn_client/merge.c
(do_file_merge): Don't bother asking for the target's entire history as
implicit mergeinfo since we don't do anything with history older than the
oldest revision being merged.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1174797&r1=1174796&r2=1174797&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Sep 23 14:23:20 2011
@@ -6822,7 +6822,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
&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)
