Bug in svnrdump (trunk@1085375) -- malformed dump file with multiple properties

Hi,

There appears to be a problem with the new svnrdump command handling revisions where multiple simultaneous property changes occur on a single file or directory. I couldn't see any mention of this in the user or dev lists elsewhere.

To recreate to bug, do the following:

svnadmin create test-original
svnadmin load test-original < original.dump
svnrdump dump file://$PWD/test-original > new.dump
svnadmin create test-new
ln -s /bin/true test-new/hooks/pre-revprop-change
svnrdump load file://$PWD/test-new < new.dump

The result of the load (also using svnadmin instead of svnrdump) is:

* Loaded revision 0.
svnrdump: E140001: Unrecognised record type in stream

The problem appears to be that multiple property changes are not consolidated into a single set of changes associated with a node, but instead appear as "orphaned" Prop-delta sections. So in the original dump you see:

Node-path:
Node-kind: dir
Node-action: change
Prop-content-length: 42
Content-length: 42

K 3
foo
V 3
bar
K 3
bar
V 3
baz
PROPS-END

But in the output from svnrdump this appears as follows:

Node-path:
Node-kind: dir
Node-action: change
Prop-delta: true
Prop-content-length: 26
Content-length: 26

K 3
foo
V 3
bar
PROPS-END

Prop-delta: true
Prop-content-length: 26
Content-length: 26

K 3
bar
V 3
baz
PROPS-END

Sorry, but I'm not quite up to providing a fix as yet, but I hope this helps someone to figure it out.

Regards,
Neil

Neil Winton
BT Innovate and Design, Tools Platform
Tel: +44 (0)1473 651976, E-Mail: neil.winton_at_bt.com<mailto:neil.winton_at_bt.com>
This email contains information from British Telecommunications plc which may be confidential or privileged. The information is intended to be for the use of the individuals or the entities named above. If you are not the intended recipient be aware that any disclosure, copying, distribution or use of the contents of this information is prohibited. If you have received this electronic message in error, please notify us by telephone or email (to the numbers or address above) immediately.
Received on 2011-03-25 15:50:51 CET