Re: svn commit: r1653988 - in /subversion/trunk/subversion: svnrdump/load_editor.c tests/cmdline/svnrdump_tests.py

Bert Huijben wrote:

>> Author: julianfoad
>> Date: Thu Jan 22 18:14:53 2015
>> New Revision: 1653988
>>
>> URL: http://svn.apache.org/r1653988
>> Log:
>> Fix issue #4551 "svnrdump load commits wrong properties, or fails, on a
>> non-deltas dumpfile", by teaching the svnrdump loader to find the original
>> properties of a copied node at the copy source location.
>
> This commit accidentally adds a few SVN_DBG() calls which I disabled in r1654039
> to unbreak compilation on a few bots.

Thank you!

> I also see new test failures on the two new tests for ra_serf.
> See
> http://ci.apache.org/builders/svn-windows-ra/builds/964/steps/Test%20fsfs%2Bserf/logs/faillog

It's another real bug in svnrdump. It calls commit_editor->change_dir_prop() twice for the same property name, which is documented as not allowed. The other RA layers don't mind, but RA-serf does.

 DBG: load_editor.c: 584: new_node_record: A/B_COPY, k=2, a=1, copy=A/B_at_2
 DBG: load_editor.c: 860: remove_node_props on A/B_COPY
 DBG: load_editor.c: 865:  rnp: using nb->copyfrom  A/B_at_2
 DBG: load_editor.c: 827: delete_node_property on A/B_COPY: p
 DBG: commit.c:1739: serf.change_dir_prop(A/B_COPY): removed_props[p]=(null)
 DBG: load_editor.c: 827: delete_node_property on A/B_COPY: q
 DBG: commit.c:1739: serf.change_dir_prop(A/B_COPY): removed_props[q]=(null)
 DBG: load_editor.c: 776: set_node_property on A/B_COPY: q=v
 DBG: commit.c:1732: serf.change_dir_prop(A/B_COPY): changed_props[q]=v
 DBG: load_editor.c: 968: close_node on A/B_COPY

I should be able to test for this bug independently of issue #4551.

- Julian
Received on 2015-01-23 11:37:59 CET