You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/12/18 17:50:07 UTC
svn commit: r1646491 -
/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
Author: julianfoad
Date: Thu Dec 18 16:50:07 2014
New Revision: 1646491
URL: http://svn.apache.org/r1646491
Log:
* subversion/svndumpfilter/svndumpfilter.c
(adjust_mergeinfo): Add a comment.
Modified:
subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1646491&r1=1646490&r2=1646491&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Thu Dec 18 16:50:07 2014
@@ -795,6 +795,13 @@ adjust_mergeinfo(svn_string_t **final_va
a merge source revision.
If the oldest rev is r0 then there is nothing to filter. */
+
+ /* ### This seems to cater only for use cases where the revisions being
+ processed are not following on from revisions that will already
+ exist in the destination repository. If the revisions being
+ processed do follow on, then we might want to keep the mergeinfo
+ that refers to those older revisions. */
+
if (rb->pb->skip_missing_merge_sources && rb->pb->oldest_original_rev > 0)
SVN_ERR(svn_mergeinfo__filter_mergeinfo_by_ranges(
&mergeinfo, mergeinfo,