Author: cmpilato
Date: Fri May 27 15:40:20 2011
New Revision: 1128367
URL: http://svn.apache.org/viewvc?rev=1128367&view=rev
Log:
Finish issue #3890 ("'svnrdump load' does not map revisions like
'svnadmin load' does").
* subversion/svnrdump/load_editor.c
(new_revision_record): Record the oldest dumpstream revision, as
that's rather crucial to the mergeinfo renumbering logic.
* subversion/tests/cmdline/svnrdump_tests.py
(dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads):
Remove @XFail() decorator.
Modified:
subversion/trunk/subversion/svnrdump/load_editor.c
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1128367&r1=1128366&r2=1128367&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri May 27 15:40:20 2011
@@ -452,6 +452,10 @@ new_revision_record(void **revision_bato
It might be positive or negative. */
rb->rev_offset = (apr_int32_t) (rb->rev) - (head_rev + 1);
+ /* Stash the oldest (non-zero) dumpstream revision seen. */
+ if ((rb->rev > 0) && (!SVN_IS_VALID_REVNUM(pb->oldest_dumpstream_rev)))
+ pb->oldest_dumpstream_rev = rb->rev;
+
/* Set the commit_editor/ commit_edit_baton to NULL and wait for
them to be created in new_node_record */
rb->pb->commit_editor = NULL;
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1128367&r1=1128366&r2=1128367&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri May 27
15:40:20 2011
@@ -421,7 +421,6 @@ def reflect_dropped_renumbered_revs(sbox
# This test replicates svnadmin_tests.py 20 'don't filter mergeinfo revs
# from incremental dump' but uses 'svnrdump [dump|load]' in place of
# 'svnadmin [dump|load]'.
-@XFail()
@Issue(3890)
def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox):
"don't drop mergeinfo revs in incremental svnrdump"
