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 2010/05/05 17:04:50 UTC
svn commit: r941331 - /subversion/trunk/subversion/svndumpfilter/main.c
Author: pburba
Date: Wed May 5 15:04:50 2010
New Revision: 941331
URL: http://svn.apache.org/viewvc?rev=941331&view=rev
Log:
More issue #3020 work, follow-up to r939709, svndumpfilter should not
consider revision 0 as a valid merge source revision.
* subversion/svndumpfilter/main.c
(parse_baton_t): Tweak comment for oldest_original_rev.
(output_revision): Don't set oldest_original_rev to r0. We use
oldest_original_rev strictly for mergeinfo stuffs and r0 has no valid
meaning as a mergeinfo source rev.
Modified:
subversion/trunk/subversion/svndumpfilter/main.c
Modified: subversion/trunk/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/main.c?rev=941331&r1=941330&r2=941331&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/main.c (original)
+++ subversion/trunk/subversion/svndumpfilter/main.c Wed May 5 15:04:50 2010
@@ -191,8 +191,8 @@ struct parse_baton_t
apr_hash_t *dropped_nodes;
apr_hash_t *renumber_history; /* svn_revnum_t -> struct revmap_t */
svn_revnum_t last_live_revision;
- /* The oldest original revision in the input stream which was
- not filtered. */
+ /* The oldest original revision, greater than r0, in the input
+ stream which was not filtered. */
svn_revnum_t oldest_original_rev;
};
@@ -397,7 +397,8 @@ output_revision(struct revision_baton_t
props->data, &(props->len)));
/* Stash the oldest original rev not dropped. */
- if (!SVN_IS_VALID_REVNUM(rb->pb->oldest_original_rev))
+ if (rb->rev_orig > 0
+ && !SVN_IS_VALID_REVNUM(rb->pb->oldest_original_rev))
rb->pb->oldest_original_rev = rb->rev_orig;
if (rb->pb->do_renumber_revs)