You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/08/31 17:47:51 UTC
svn commit: r1163672 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: pburba
Date: Wed Aug 31 15:47:50 2011
New Revision: 1163672
URL: http://svn.apache.org/viewvc?rev=1163672&view=rev
Log:
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_dir_merge): No need to use MAX/MIN macros on revision
arguments to svn_client__get_history_as_mergeinfo. If we are in this
block we know it's a forward merge and thus which revision is youngest.
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=1163672&r1=1163671&r2=1163672&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Aug 31 15:47:50 2011
@@ -7966,8 +7966,8 @@ record_mergeinfo_for_dir_merge(svn_merge
SVN_ERR(svn_client__get_history_as_mergeinfo(
&subtree_history_as_mergeinfo, NULL,
subtree_mergeinfo_url, &peg_revision,
- MAX(merged_range->start, merged_range->end),
- MIN(merged_range->start, merged_range->end),
+ merged_range->end,
+ merged_range->start,
merge_b->ra_session2, merge_b->ctx, iterpool));
if (old_session_url)