Steven Barbaglia
2017-03-23 11:53:48 UTC
The current version of svndumpfilter in trunk is dropping the line with PROPS-END on all empty revisions, causing malformed errors later on when trying to load the dump file into a repository.
$ svndumpfilter --version
svndumpfilter, version 1.10.0 (r1784492)
compiled Mar 22 2017, 19:02:41 on x86_64-unknown-linux-gnu
...
$ cat sample.dump
SVN-fs-dump-format-version: 3
UUID: d3321e12-171b-46ef-8253-cae8004b8185
Revision-number: 0
Prop-content-length: 56
Content-length: 56
K 8
svn:date
V 27
2009-08-25T14:41:52.265643Z
PROPS-END
Revision-number: 1
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 2
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 3
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 4
Prop-content-length: 98
Content-length: 98
K 10
svn:author
V 4
root
K 8
svn:date
V 27
2010-05-23T11:51:57.216283Z
K 7
svn:log
V 0
PROPS-END
$ svndumpfilter include / < sample.dump > filtered.dump
Including prefixes:
'/'
Revision 0 committed as 0.
Revision 1 committed as 1.
Revision 2 committed as 2.
Revision 3 committed as 3.
Revision 4 committed as 4.
$ cat filtered.dump
SVN-fs-dump-format-version: 3
UUID: d3321e12-171b-46ef-8253-cae8004b8185
Revision-number: 0
Prop-content-length: 56
Content-length: 56
K 8
svn:date
V 27
2009-08-25T14:41:52.265643Z
PROPS-END
Revision-number: 1
Prop-content-length: 10
Content-length: 10
Revision-number: 2
Prop-content-length: 10
Content-length: 10
Revision-number: 3
Prop-content-length: 10
Content-length: 10
Revision-number: 4
Prop-content-length: 98
Content-length: 98
K 10
svn:author
V 4
root
K 8
svn:date
V 27
2010-05-23T11:51:57.216283Z
K 7
svn:log
V 0
PROPS-END
I hope the above will help pin down the problem.
Steven
-----------------------------------------------------------------
Sinara provides software development services and software products to major financial sector clients. For 25 years, we have combined strong technical skills with a pragmatic and flexible approach to deliver and support reliable IT systems for a global client base.
http://www.sinara.com
mailto:***@sinara.co.uk
+44 20 7940 7950
Disclaimer: This e-mail message (and any attachments) is confidential and may contain privileged information. It is for the intended recipient only. If you are not the intended recipient, you must not copy, distribute or use any of the information in it. If you receive this message in error please notify us as soon as possible and delete it. Copyright in this e-mail and attachments created by us belongs to Sinara Consultants Limited. Internet e-mails are not secure. Sinara does not accept responsibility for changes made to this message after it was sent. Should you communicate with anyone at Sinara by email you consent to us monitoring and reading any such correspondence.
$ svndumpfilter --version
svndumpfilter, version 1.10.0 (r1784492)
compiled Mar 22 2017, 19:02:41 on x86_64-unknown-linux-gnu
...
$ cat sample.dump
SVN-fs-dump-format-version: 3
UUID: d3321e12-171b-46ef-8253-cae8004b8185
Revision-number: 0
Prop-content-length: 56
Content-length: 56
K 8
svn:date
V 27
2009-08-25T14:41:52.265643Z
PROPS-END
Revision-number: 1
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 2
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 3
Prop-content-length: 10
Content-length: 10
PROPS-END
Revision-number: 4
Prop-content-length: 98
Content-length: 98
K 10
svn:author
V 4
root
K 8
svn:date
V 27
2010-05-23T11:51:57.216283Z
K 7
svn:log
V 0
PROPS-END
$ svndumpfilter include / < sample.dump > filtered.dump
Including prefixes:
'/'
Revision 0 committed as 0.
Revision 1 committed as 1.
Revision 2 committed as 2.
Revision 3 committed as 3.
Revision 4 committed as 4.
$ cat filtered.dump
SVN-fs-dump-format-version: 3
UUID: d3321e12-171b-46ef-8253-cae8004b8185
Revision-number: 0
Prop-content-length: 56
Content-length: 56
K 8
svn:date
V 27
2009-08-25T14:41:52.265643Z
PROPS-END
Revision-number: 1
Prop-content-length: 10
Content-length: 10
Revision-number: 2
Prop-content-length: 10
Content-length: 10
Revision-number: 3
Prop-content-length: 10
Content-length: 10
Revision-number: 4
Prop-content-length: 98
Content-length: 98
K 10
svn:author
V 4
root
K 8
svn:date
V 27
2010-05-23T11:51:57.216283Z
K 7
svn:log
V 0
PROPS-END
I hope the above will help pin down the problem.
Steven
-----------------------------------------------------------------
Sinara provides software development services and software products to major financial sector clients. For 25 years, we have combined strong technical skills with a pragmatic and flexible approach to deliver and support reliable IT systems for a global client base.
http://www.sinara.com
mailto:***@sinara.co.uk
+44 20 7940 7950
Disclaimer: This e-mail message (and any attachments) is confidential and may contain privileged information. It is for the intended recipient only. If you are not the intended recipient, you must not copy, distribute or use any of the information in it. If you receive this message in error please notify us as soon as possible and delete it. Copyright in this e-mail and attachments created by us belongs to Sinara Consultants Limited. Internet e-mails are not secure. Sinara does not accept responsibility for changes made to this message after it was sent. Should you communicate with anyone at Sinara by email you consent to us monitoring and reading any such correspondence.