You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ramkumar Ramachandra <ar...@gmail.com> on 2010/07/24 16:41:21 UTC

[PATCH] Import svnsync tests into svnrdump

Hi,

The tests in svnsync_tests_data/ are in dumpfile v2 and these are
unsuitable for testing svnrdump. Hence, load all of them into a
repository and re-dump them in dumpfile v3 format before attempting to
add them to svnrdump_tests_data/. I still have to figure out how to
extend the test framework to ignore certain headers in the diff-
currently, using run_test() in svnrdump to run tests corresponding to
these files will fail all tests.

Thanks.

-- Ram

[[[
[in subversion/tests/cmdline/svnrdump_tests_data/]
Import the dumpfiles corresponding to the first 13 svnsync tests from
subversion/tests/cmdline/svnsync_tests_data after converting them to
dumpfile v3 format. Files added:
* copy-and-modify.dump
* copy-from-previous-version-and-modify.dump
* copy-from-previous-version.dump
* copy-parent-modify-prop.dump
* detect-meddling.dump
* dir-prop-change.dump
* file-dir-file.dump
* modified-in-place.dump
* tag-empty-trunk.dump
* tag-trunk-with-dir.dump
* tag-trunk-with-file2.dump
* tag-trunk-with-file.dump
* tag-with-modified-file.dump
]]]

Index: subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version-and-modify.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version-and-modify.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version-and-modify.dump	(working copy)
@@ -0,0 +1,96 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 6ad9f820-0205-0410-94a2-c8cf366bb2b3
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 1149e75a1dc9b23c9138242a2e7d255f
+Prop-content-sha1: (svn:date) 51b023ca17e273bb79c1b6921d6180099dfa96d0
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-07T23:36:48.095832Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 112
+Prop-content-md5: (svn:log) 028454ec513c889b513ba2840bcdef1a
+Prop-content-sha1: (svn:log) e471eead535637bfd0d9cd8f44b6d36621ffb9b8
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 82b427150f118980996d1ff2f20c8ed9
+Prop-content-sha1: (svn:date) 0da5c3bee3e0d93cbe0d7094973bb169db5f184f
+Content-length: 112
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T23:37:17.705159Z
+K 7
+svn:log
+V 11
+add foo.txt
+PROPS-END
+
+Node-path: foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
+Revision-number: 2
+Prop-content-length: 135
+Prop-content-md5: (svn:log) 21e740d34f10f1962e0e115eff7b00ce
+Prop-content-sha1: (svn:log) 4f1bff081e7cdc7cb82c6859162ee21010c86d60
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 822d6ff42b93d5f3429b9f1db1341a0c
+Prop-content-sha1: (svn:date) 1192c3c4f4a4af789ef996b3f7cdc3cce4e3484e
+Content-length: 135
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T23:37:44.549695Z
+K 7
+svn:log
+V 34
+copy and change at the same time.
+
+PROPS-END
+
+Node-path: bar.txt
+Node-kind: file
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: foo.txt
+Text-copy-source-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-copy-source-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Text-delta: true
+Text-delta-base-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-delta-base-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Text-content-length: 19
+Text-content-md5: d2508118d0d39e198d1129d87d692d59
+Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020
+Content-length: 19
+
+SVN		�modified
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump	(working copy)
@@ -0,0 +1,96 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 6ad9f820-0205-0410-94a2-c8cf366bb2b3
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 1149e75a1dc9b23c9138242a2e7d255f
+Prop-content-sha1: (svn:date) 51b023ca17e273bb79c1b6921d6180099dfa96d0
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-07T23:36:48.095832Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 112
+Prop-content-md5: (svn:log) 028454ec513c889b513ba2840bcdef1a
+Prop-content-sha1: (svn:log) e471eead535637bfd0d9cd8f44b6d36621ffb9b8
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 82b427150f118980996d1ff2f20c8ed9
+Prop-content-sha1: (svn:date) 0da5c3bee3e0d93cbe0d7094973bb169db5f184f
+Content-length: 112
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T23:37:17.705159Z
+K 7
+svn:log
+V 11
+add foo.txt
+PROPS-END
+
+Node-path: foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
+Revision-number: 2
+Prop-content-length: 135
+Prop-content-md5: (svn:log) 21e740d34f10f1962e0e115eff7b00ce
+Prop-content-sha1: (svn:log) 4f1bff081e7cdc7cb82c6859162ee21010c86d60
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 822d6ff42b93d5f3429b9f1db1341a0c
+Prop-content-sha1: (svn:date) 1192c3c4f4a4af789ef996b3f7cdc3cce4e3484e
+Content-length: 135
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T23:37:44.549695Z
+K 7
+svn:log
+V 34
+copy and change at the same time.
+
+PROPS-END
+
+Node-path: bar.txt
+Node-kind: file
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: foo.txt
+Text-copy-source-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-copy-source-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Text-delta: true
+Text-delta-base-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-delta-base-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Text-content-length: 19
+Text-content-md5: d2508118d0d39e198d1129d87d692d59
+Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020
+Content-length: 19
+
+SVN		�modified
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/dir-prop-change.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/dir-prop-change.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/dir-prop-change.dump	(working copy)
@@ -0,0 +1,152 @@
+SVN-fs-dump-format-version: 3
+
+UUID: a5ac5a0e-0105-0410-a82a-edd0b5a7eba7
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 3f9d3061b50ad8d8a335682e491af0da
+Prop-content-sha1: (svn:date) 0043f7b3ac54b9e6d8e117afa3fd1c68cfd1fa7f
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-07T22:20:00.772497Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 115
+Prop-content-md5: (svn:log) 4ab9e582f3170b1da8428f34f37acf20
+Prop-content-sha1: (svn:log) 43a0bac46b9fa5d856ab146334082f1edd13134e
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) fdb200dfc19d911f3b76b1a6c7b1a9ea
+Prop-content-sha1: (svn:date) d48ff8f98d7d4f4ea09001bebfc587594a42322f
+Content-length: 115
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T22:20:16.583093Z
+K 7
+svn:log
+V 14
+initial layout
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 112
+Prop-content-md5: (svn:log) 8977446179f59b78ded2b47fdfae2030
+Prop-content-sha1: (svn:log) 4eda8ceeab6d9a0c88b180462088b33702c1b601
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) ae03b06fa8f3a5eda080fd3da5fca4d9
+Prop-content-sha1: (svn:date) 7caaa073b292e167331993804eb9757885932a5e
+Content-length: 112
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T22:20:39.840815Z
+K 7
+svn:log
+V 11
+add a file
+
+PROPS-END
+
+Node-path: trunk/foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 18
+Text-content-md5: 2973ad11c859f59a44bf3ae776a346b1
+Text-content-sha1: ac657117c81fad228ccdb8c6d0861bdafca9ba3c
+Content-length: 28
+
+PROPS-END
+SVN�a file.
+
+
+Revision-number: 3
+Prop-content-length: 126
+Prop-content-md5: (svn:log) 06ef13f1a8006557c7b6d46dee3eb66c
+Prop-content-sha1: (svn:log) 2484bc04cccf795d0cdc5d7ee843e747f733e2d7
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) b821684085862165543e9747af5c4a6f
+Prop-content-sha1: (svn:date) a05bfbd3e1370b85fe541ccf1bc0c97540a12188
+Content-length: 126
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T22:21:15.332479Z
+K 7
+svn:log
+V 25
+tag with a modified file
+
+PROPS-END
+
+Node-path: tags/a-tag-with-mods
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 2
+Node-copyfrom-path: trunk
+
+
+Node-path: tags/a-tag-with-mods/foo.txt
+Node-kind: file
+Node-action: change
+Text-delta: true
+Text-delta-base-md5: 2973ad11c859f59a44bf3ae776a346b1
+Text-delta-base-sha1: ac657117c81fad228ccdb8c6d0861bdafca9ba3c
+Text-content-length: 27
+Text-content-md5: 30ec0b35cc9c19332cbab42768cf5df6
+Text-content-sha1: c7197a5efb7afcc64f713f7718f0ab1638f2098b
+Content-length: 27
+
+SVN�a modified file.
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/tag-with-modified-file.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/tag-with-modified-file.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/tag-with-modified-file.dump	(working copy)
@@ -0,0 +1,146 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 9bc56067-ff04-0410-83a8-bf961f5bc06a
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 06156cb677da23ca75ca86ca4a14fb8f
+Prop-content-sha1: (svn:date) a7f2bcd4666a392a9aa9d1c739d490d22ff50bfc
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-07T20:21:44.409773Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 115
+Prop-content-md5: (svn:log) 4ab9e582f3170b1da8428f34f37acf20
+Prop-content-sha1: (svn:log) 43a0bac46b9fa5d856ab146334082f1edd13134e
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) ed886aa69961cfa6adb3b936ffc80889
+Prop-content-sha1: (svn:date) 12760e904f72cb239eea36c02488f94a65f5af3a
+Content-length: 115
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T20:22:08.601650Z
+K 7
+svn:log
+V 14
+initial layout
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 111
+Prop-content-md5: (svn:log) b1f4cf34cf2348c4d30bcefce58e46e7
+Prop-content-sha1: (svn:log) 39b4de55d6c748d9adb1e13c09daf81bf2b4e89d
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 1850831dfb94f96c873dfab34c9f9ed0
+Prop-content-sha1: (svn:date) 768a02028e9b7f7d70422366e9e18391db9aeb78
+Content-length: 111
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T20:22:25.607033Z
+K 7
+svn:log
+V 10
+add a file
+PROPS-END
+
+Node-path: trunk/foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 26
+Text-content-md5: 0bebeeefa6853d064099b54a81a627e8
+Text-content-sha1: b78087338d3daf51e667056c78fd8089bb51d5ec
+Content-length: 36
+
+PROPS-END
+SVN�this is a file.
+
+
+Revision-number: 3
+Prop-content-length: 113
+Prop-content-md5: (svn:log) 0aaf4edeabbca22a01ab87cbb4c54543
+Prop-content-sha1: (svn:log) f42b93ee6a78447b18229c616745a5f965167383
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 1872a9c3ebf036b1b88cd553bf71d9b1
+Prop-content-sha1: (svn:date) 36cf7ac0d23cd15f8e4983192a370d545e293f56
+Content-length: 113
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T20:22:46.490796Z
+K 7
+svn:log
+V 12
+make a tag.
+
+PROPS-END
+
+Node-path: tags/a-tag-with-file-contents
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Node-path: tags/a-tag-with-file-contents/foo.txt
+Node-kind: file
+Node-action: add
+Node-copyfrom-rev: 2
+Node-copyfrom-path: trunk/foo.txt
+Text-copy-source-md5: 0bebeeefa6853d064099b54a81a627e8
+Text-copy-source-sha1: b78087338d3daf51e667056c78fd8089bb51d5ec
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-dir.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-dir.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-dir.dump	(working copy)
@@ -0,0 +1,89 @@
+SVN-fs-dump-format-version: 3
+
+UUID: c38a9451-c504-0410-b613-a343b2d5fd66
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) d3e68c204824c9d773669f1589ee632e
+Prop-content-sha1: (svn:date) b013b81522077aea7d8473b0c5ac140021f11059
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-04T23:03:50.600647Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 105
+Prop-content-md5: (svn:log) a0f848942ce863cf53c0fa6cc684007d
+Prop-content-sha1: (svn:log) 80437a44a661d141174209119d54125a59a64b2a
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 56078dd7c8ee30deab799602d25a2794
+Prop-content-sha1: (svn:date) 815da5e8791ae8d419e0c2c83f139a5fe6a3e001
+Content-length: 105
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-04T23:04:15.060966Z
+K 7
+svn:log
+V 5
+setup
+PROPS-END
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 106
+Prop-content-md5: (svn:log) 71144bec603905f49f4253f77fd5a9ef
+Prop-content-sha1: (svn:log) ed2db88fb56683d3e2b1e2163408a0e907f06fa8
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 862458ae04a246c9891d0b8a1d7d9644
+Prop-content-sha1: (svn:date) ab480fd6e98659ca9ce03f3eff7213ca303f8f29
+Content-length: 106
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-04T23:04:32.222710Z
+K 7
+svn:log
+V 6
+tag it
+PROPS-END
+
+Node-path: tags/an-empty-tag
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file.dump	(working copy)
@@ -0,0 +1,98 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 20f4d640-c604-0410-95c8-f4ec7efce8dc
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) a046659177c52c6746917821511f9318
+Prop-content-sha1: (svn:date) 38fd1e0ee328137f9d719300004dca3292d143b1
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-05T00:10:44.707628Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 105
+Prop-content-md5: (svn:log) c13d88cb4cb02003daedb8a84e5d272a
+Prop-content-sha1: (svn:log) 5eee38381388b6f30efdd5c5c6f067dbf32c0bb3
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) d92941fc4884b1a17572b249445b4c23
+Prop-content-sha1: (svn:date) 8f38fcb744bd1143533f08521db241cb54501bd1
+Content-length: 105
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-05T00:11:07.194039Z
+K 7
+svn:log
+V 5
+stuff
+PROPS-END
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/dir
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 111
+Prop-content-md5: (svn:log) 98fa34b678d0bc616dc453ff71453ae5
+Prop-content-sha1: (svn:log) a3b3d00c74cb34cca8ce31435943bee58bf3b6e1
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 9c81fd8fde02dc15ec88a8680dc74d26
+Prop-content-sha1: (svn:date) 2d25c8fb2554c0a0560109ad573db6eb26acb582
+Content-length: 111
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-05T00:11:18.910470Z
+K 7
+svn:log
+V 10
+more stuff
+PROPS-END
+
+Node-path: tags/a-tag
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/copy-parent-modify-prop.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/copy-parent-modify-prop.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/copy-parent-modify-prop.dump	(working copy)
@@ -0,0 +1,88 @@
+SVN-fs-dump-format-version: 3
+
+UUID: bd4c07e3-6b11-0410-8af7-f8eca344b6da
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) f5dac4babcf6704064f289554907048a
+Prop-content-sha1: (svn:date) bcfed6a359522261d423ef926f94c9c6923e579e
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2006-04-14T22:49:34.922133Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 105
+Prop-content-md5: (svn:log) c13d88cb4cb02003daedb8a84e5d272a
+Prop-content-sha1: (svn:log) 5eee38381388b6f30efdd5c5c6f067dbf32c0bb3
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 50c9b5475428091781810ef78f122277
+Prop-content-sha1: (svn:date) d28f750443887b4cf7300a6e1360212ca6c6b971
+Content-length: 105
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2006-04-14T22:50:10.459753Z
+K 7
+svn:log
+V 5
+stuff
+PROPS-END
+
+Node-path: a.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
+Node-path: q
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: q/zot.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
+Node-path: z.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
Index: subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file2.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file2.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file2.dump	(working copy)
@@ -0,0 +1,146 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 9bc56067-ff04-0410-83a8-bf961f5bc06a
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 06156cb677da23ca75ca86ca4a14fb8f
+Prop-content-sha1: (svn:date) a7f2bcd4666a392a9aa9d1c739d490d22ff50bfc
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-07T20:21:44.409773Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 115
+Prop-content-md5: (svn:log) 4ab9e582f3170b1da8428f34f37acf20
+Prop-content-sha1: (svn:log) 43a0bac46b9fa5d856ab146334082f1edd13134e
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) ed886aa69961cfa6adb3b936ffc80889
+Prop-content-sha1: (svn:date) 12760e904f72cb239eea36c02488f94a65f5af3a
+Content-length: 115
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T20:22:08.601650Z
+K 7
+svn:log
+V 14
+initial layout
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 111
+Prop-content-md5: (svn:log) b1f4cf34cf2348c4d30bcefce58e46e7
+Prop-content-sha1: (svn:log) 39b4de55d6c748d9adb1e13c09daf81bf2b4e89d
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 1850831dfb94f96c873dfab34c9f9ed0
+Prop-content-sha1: (svn:date) 768a02028e9b7f7d70422366e9e18391db9aeb78
+Content-length: 111
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T20:22:25.607033Z
+K 7
+svn:log
+V 10
+add a file
+PROPS-END
+
+Node-path: trunk/foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 26
+Text-content-md5: 0bebeeefa6853d064099b54a81a627e8
+Text-content-sha1: b78087338d3daf51e667056c78fd8089bb51d5ec
+Content-length: 36
+
+PROPS-END
+SVN�this is a file.
+
+
+Revision-number: 3
+Prop-content-length: 113
+Prop-content-md5: (svn:log) 0aaf4edeabbca22a01ab87cbb4c54543
+Prop-content-sha1: (svn:log) f42b93ee6a78447b18229c616745a5f965167383
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 1872a9c3ebf036b1b88cd553bf71d9b1
+Prop-content-sha1: (svn:date) 36cf7ac0d23cd15f8e4983192a370d545e293f56
+Content-length: 113
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-07T20:22:46.490796Z
+K 7
+svn:log
+V 12
+make a tag.
+
+PROPS-END
+
+Node-path: tags/a-tag-with-file-contents
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Node-path: tags/a-tag-with-file-contents/foo.txt
+Node-kind: file
+Node-action: add
+Node-copyfrom-rev: 2
+Node-copyfrom-path: trunk/foo.txt
+Text-copy-source-md5: 0bebeeefa6853d064099b54a81a627e8
+Text-copy-source-sha1: b78087338d3daf51e667056c78fd8089bb51d5ec
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/modified-in-place.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/modified-in-place.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/modified-in-place.dump	(working copy)
@@ -0,0 +1,218 @@
+SVN-fs-dump-format-version: 3
+
+UUID: c542f1c4-a005-0410-b9aa-b3fbdc38f810
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 71c1690393b5a56e01e7a2b7c908a780
+Prop-content-sha1: (svn:date) 694de0c9c45d5e19b17955cc997d09e4da39c7a7
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-15T20:52:43.894708Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 104
+Prop-content-md5: (svn:log) 4b85ef081cea4427d322b9a5ae074883
+Prop-content-sha1: (svn:log) 76c5e51fa8093ca45c09fe9db28d2a7e2f542fda
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 1fe09cb2b902d6b29446da12dc23f25d
+Prop-content-sha1: (svn:date) 1459fb9c21694e991ab3b2e583a4066efe9387bc
+Content-length: 104
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T20:53:08.484681Z
+K 7
+svn:log
+V 4
+ttb
+
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 119
+Prop-content-md5: (svn:log) 0549646e1584cced67f1092212d2be1d
+Prop-content-sha1: (svn:log) 5d0c5ed2b84ac7525314910591d39ec65d9e50e5
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 0d616763dde65ede079e11c65478e2e8
+Prop-content-sha1: (svn:date) 15ad3d0c864290db9de4df7517643b3fd5281f5b
+Content-length: 119
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T20:53:34.716301Z
+K 7
+svn:log
+V 18
+Add first version
+
+PROPS-END
+
+Node-path: trunk/file.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 32
+Text-content-md5: bb55f6530f359710b6e52f0d5a9f544f
+Text-content-sha1: df4f5675e945ac7f4a776cb068aeb3bc5fb5fd29
+Content-length: 42
+
+PROPS-END
+SVN�first version of file
+
+
+Revision-number: 3
+Prop-content-length: 120
+Prop-content-md5: (svn:log) 916871deb9ac5526fca40db76a72985c
+Prop-content-sha1: (svn:log) 1aad072bdf803ad0de70c443b5182b4100c6f2a3
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) c8502d1e0319e9dda67dfb2fce9e6985
+Prop-content-sha1: (svn:date) 450ec68bc28624f7d50c5bfc7d5090f9c352fb83
+Content-length: 120
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T20:53:48.805239Z
+K 7
+svn:log
+V 19
+Add second version
+
+PROPS-END
+
+Node-path: trunk/file.txt
+Node-kind: file
+Node-action: change
+Text-delta: true
+Text-delta-base-md5: bb55f6530f359710b6e52f0d5a9f544f
+Text-delta-base-sha1: df4f5675e945ac7f4a776cb068aeb3bc5fb5fd29
+Text-content-length: 33
+Text-content-md5: d6e0e9fdc2cb38352eca81f093110f4b
+Text-content-sha1: 64f3eeab9a2fce6b19eec365bbb181561718b999
+Content-length: 33
+
+SVN�second version of file
+
+
+Revision-number: 4
+Prop-content-length: 149
+Prop-content-md5: (svn:log) 44df3ae258e83d634825f2627012ff67
+Prop-content-sha1: (svn:log) 14b594e53f69529822394f921013a4b1416f84ce
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) b99bb052f93b547195b5485df4cb53f5
+Prop-content-sha1: (svn:date) 5707a472c230b623311bb502ef78c68f2ef5ded4
+Content-length: 149
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T20:56:25.247172Z
+K 7
+svn:log
+V 48
+Add a new file to create an uninvolved revision
+
+PROPS-END
+
+Node-path: trunk/foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
+Revision-number: 5
+Prop-content-length: 131
+Prop-content-md5: (svn:log) 36fd1b91d37eaf3c9ed485ade1894c51
+Prop-content-sha1: (svn:log) 5bd65804f11199cfa87593f20e39a12b3b1fe307
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) a035f965a4990e60f05a199d9ef4fcd7
+Prop-content-sha1: (svn:date) 497960a480336a4afe102b3da3bd55b7e0f329e6
+Content-length: 131
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T20:56:46.198327Z
+K 7
+svn:log
+V 30
+copy from a previous revision
+
+PROPS-END
+
+Node-path: trunk/copy-of-file.txt
+Node-kind: file
+Node-action: add
+Node-copyfrom-rev: 2
+Node-copyfrom-path: trunk/file.txt
+Text-copy-source-md5: bb55f6530f359710b6e52f0d5a9f544f
+Text-copy-source-sha1: df4f5675e945ac7f4a776cb068aeb3bc5fb5fd29
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version.dump	(working copy)
@@ -0,0 +1,188 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 5bd4ad05-a105-0410-b7b7-c014cebbdc5c
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) fd4090f2960efcdf6abf5454fd05cf61
+Prop-content-sha1: (svn:date) 5acb4fce316e7bcf08732f17f2110f37d5280e46
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-15T21:10:49.994595Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 103
+Prop-content-md5: (svn:log) 5561542342419b28f1e047fa049fcd97
+Prop-content-sha1: (svn:log) 86f954fb5b1d38eaf94e98081349e2c3cd57ca2e
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 4c704226217ff1187f5b6e76ab2ac76d
+Prop-content-sha1: (svn:date) d9f19ca5f3ec340dd8f12b69519b2e4fd09c8a84
+Content-length: 103
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T21:10:58.608841Z
+K 7
+svn:log
+V 3
+ttb
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: tags
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 116
+Prop-content-md5: (svn:log) cb12c9f5c240b1269cfae7d313a00cc3
+Prop-content-sha1: (svn:log) 2298d68cb3248d3b8b771094072db7f1da76d51b
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) b2e92f1550a6e7e4013780d6aa3a8c64
+Prop-content-sha1: (svn:date) f41a4e0c5eaae0b7102290ac93f6d388adc87e39
+Content-length: 116
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T21:11:19.415517Z
+K 7
+svn:log
+V 15
+first version!
+
+PROPS-END
+
+Node-path: trunk/file.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 24
+Text-content-md5: 9f089b639127e2f5a79c4eda189678d6
+Text-content-sha1: b1c2f43edab746cec4857f5d4b00579922a83d92
+Content-length: 34
+
+PROPS-END
+SVN�first version
+
+
+Revision-number: 3
+Prop-content-length: 117
+Prop-content-md5: (svn:log) 493e30551e54923e3ab2f42c19425d66
+Prop-content-sha1: (svn:log) fc3a1195fec09f2033340b4446661afd2ff66d6e
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 48458d341152b911b6fad8b8562fd43c
+Prop-content-sha1: (svn:date) 324d729438bf679dfce060d0bb490cd91e1ae122
+Content-length: 117
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T21:11:29.391885Z
+K 7
+svn:log
+V 16
+second version!
+
+PROPS-END
+
+Node-path: trunk/file.txt
+Node-kind: file
+Node-action: change
+Text-delta: true
+Text-delta-base-md5: 9f089b639127e2f5a79c4eda189678d6
+Text-delta-base-sha1: b1c2f43edab746cec4857f5d4b00579922a83d92
+Text-content-length: 25
+Text-content-md5: 27f60b341727cb8ed1de139b0da7c173
+Text-content-sha1: b61e81f23c338df5c1dff26963f755d4226227c6
+Content-length: 25
+
+SVN�second version
+
+
+Revision-number: 4
+Prop-content-length: 122
+Prop-content-md5: (svn:log) d09923504d20bd3b1862d2acd117c856
+Prop-content-sha1: (svn:log) 39b7db5a437d09a99a5ffb8dc471825480227732
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) cc777234c61a92b795cac28418e4b2c8
+Prop-content-sha1: (svn:date) 52e42bc0954bf4e2045fc5ca3c6deb8c6fa0ee8f
+Content-length: 122
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-15T21:11:50.278301Z
+K 7
+svn:log
+V 21
+a copy, but modified
+
+PROPS-END
+
+Node-path: trunk/copy-of-file.txt
+Node-kind: file
+Node-action: add
+Node-copyfrom-rev: 2
+Node-copyfrom-path: trunk/file.txt
+Text-copy-source-md5: 9f089b639127e2f5a79c4eda189678d6
+Text-copy-source-sha1: b1c2f43edab746cec4857f5d4b00579922a83d92
+Text-delta: true
+Text-delta-base-md5: 9f089b639127e2f5a79c4eda189678d6
+Text-delta-base-sha1: b1c2f43edab746cec4857f5d4b00579922a83d92
+Text-content-length: 38
+Text-content-md5: 7b4d0f5ac875af39d2ee3a67798f5754
+Text-content-sha1: 2040e27d431428a216382b42560dccaaa5e1b3b6
+Content-length: 38
+
+SVN�first version, but modified
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/file-dir-file.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/file-dir-file.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/file-dir-file.dump	(working copy)
@@ -0,0 +1,58 @@
+SVN-fs-dump-format-version: 3
+
+UUID: b760f8ea-7608-0410-b9cc-88a00389c87b
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 7741d67d3f97aa1b4c6532187f289027
+Prop-content-sha1: (svn:date) 5853b49cbc8fe34fecbb6978a812723570130ab8
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-12-21T23:12:28.152181Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 105
+Prop-content-md5: (svn:log) 0d599f0ec05c3bda8c3b8a68c32a1b47
+Prop-content-sha1: (svn:log) 4cbd040533a2f43fc6691d773d510cda70f4126a
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) a9286b75679e0f198aebed8d81093b8f
+Prop-content-sha1: (svn:date) bf5e60dd41846af4a1938a145e5b2dc72caf7a65
+Content-length: 105
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-12-21T23:12:58.931794Z
+K 7
+svn:log
+V 5
+blah
+
+PROPS-END
+
+Node-path: 
+Node-kind: dir
+Node-action: change
+Prop-delta: true
+Prop-content-length: 37
+Prop-content-md5: (svn:ignore) 9eb84090956c484e32cb6c08455a667b
+Prop-content-sha1: (svn:ignore) 003d0450f6f7e6db635a04d23245b68e13365463
+Content-length: 37
+
+K 10
+svn:ignore
+V 6
+stuff
+
+PROPS-END
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/tag-empty-trunk.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/tag-empty-trunk.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/tag-empty-trunk.dump	(working copy)
@@ -0,0 +1,94 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 103a2b4e-2705-0410-8a58-ca61540ba721
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) e88767e42382220d125be1ed367629cc
+Prop-content-sha1: (svn:date) 80df200b991a20c34d6b4e114b2fc2d98137f51a
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2005-11-09T19:58:00.162066Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 114
+Prop-content-md5: (svn:log) 527f4d0c1fe36603a9be30f07a163dd2
+Prop-content-sha1: (svn:log) cf4534434e876d77c8cdc66637f027dd7d9d2fde
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) 6ec8580a0f6a77bae0ce365f41126e35
+Prop-content-sha1: (svn:date) d8b503d01cfb7391d0a5ecdf712787cdd6643cd3
+Content-length: 114
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-09T19:58:23.561942Z
+K 7
+svn:log
+V 13
+Added a file
+
+PROPS-END
+
+Node-path: foo.txt
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 25
+Text-content-md5: 26bb73556ceb32a5df30b733c5355ee5
+Text-content-sha1: 1c8c6df57252f0cc13dd2d763f4aef9affe1817c
+Content-length: 35
+
+PROPS-END
+SVN�this is a file
+
+
+Revision-number: 2
+Prop-content-length: 112
+Prop-content-md5: (svn:log) e9da24feb3b462593fc3d94b8cfaef47
+Prop-content-sha1: (svn:log) b041b2bbd7f4ad042af1a8895946aff08c4699c3
+Prop-content-md5: (svn:author) c9bd66513549086361ea008b319307f8
+Prop-content-sha1: (svn:author) f9752bcda9e6e513d24f99a02b46cb539a5f63b9
+Prop-content-md5: (svn:date) d6010780d9e5f26194eaa2e4df698201
+Prop-content-sha1: (svn:date) 55a882a65d5c697e3fcf4f7abad507fcb7809e5c
+Content-length: 112
+
+K 10
+svn:author
+V 6
+rooneg
+K 8
+svn:date
+V 27
+2005-11-09T19:58:38.412025Z
+K 7
+svn:log
+V 11
+modified it
+PROPS-END
+
+Node-path: foo.txt
+Node-kind: file
+Node-action: change
+Text-delta: true
+Text-delta-base-md5: 26bb73556ceb32a5df30b733c5355ee5
+Text-delta-base-sha1: 1c8c6df57252f0cc13dd2d763f4aef9affe1817c
+Text-content-length: 48
+Text-content-md5: d9bf46ecc7a555936e5115241b93258b
+Text-content-sha1: 1586ddcffca1e5f724b0eea7bb9d6b41f67c7ba6
+Content-length: 48
+
+SVN&&�this is a file
+now it's been modified
+
+
Index: subversion/tests/cmdline/svnrdump_tests_data/detect-meddling.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/detect-meddling.dump	(revision 0)
+++ subversion/tests/cmdline/svnrdump_tests_data/detect-meddling.dump	(working copy)
@@ -0,0 +1,109 @@
+SVN-fs-dump-format-version: 3
+
+UUID: 265b4915-c811-0410-a32e-b5d713837d08
+
+Revision-number: 0
+Prop-content-length: 56
+Prop-content-md5: (svn:date) 9f53196b42e188e442bc8eb52a1d9d74
+Prop-content-sha1: (svn:date) 9a79567c8ea6602419906c884375b991192809a4
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2006-04-19T12:49:15.123309Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 113
+Prop-content-md5: (svn:log) 72ffb773423f22336dde7f46496524e7
+Prop-content-sha1: (svn:log) 03dabddc6ce90096d36253e79ac313e12c0ae1e1
+Prop-content-md5: (svn:author) 288404204e3d452229308317344a285d
+Prop-content-sha1: (svn:author) f437cb078acc7c6d79873462334a355eddeb9459
+Prop-content-md5: (svn:date) cb206ac7669eef47b8114c405fae6564
+Prop-content-sha1: (svn:date) ed9527991cf785cdb071bdce4de1c5b40820c37a
+Content-length: 113
+
+K 10
+svn:author
+V 2
+pl
+K 8
+svn:date
+V 27
+2006-04-19T12:50:29.623828Z
+K 7
+svn:log
+V 16
+add dir and file
+PROPS-END
+
+Node-path: dir
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: dir/f
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-delta: true
+Text-content-length: 4
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 14
+
+PROPS-END
+SVN
+
+Revision-number: 2
+Prop-content-length: 126
+Prop-content-md5: (svn:log) 20a4aced061c11873a124cc8af5a5ad2
+Prop-content-sha1: (svn:log) 241158d9dac741dce67f2a979db8d3c4ffae0032
+Prop-content-md5: (svn:author) 288404204e3d452229308317344a285d
+Prop-content-sha1: (svn:author) f437cb078acc7c6d79873462334a355eddeb9459
+Prop-content-md5: (svn:date) ff6b2f46707c1d5c7a25da1ac2281676
+Prop-content-sha1: (svn:date) bf4df558ea209dba9f93a3464022cde10e9b4e0f
+Content-length: 126
+
+K 10
+svn:author
+V 2
+pl
+K 8
+svn:date
+V 27
+2006-04-19T12:51:15.837786Z
+K 7
+svn:log
+V 29
+copy dir and modify prop of f
+PROPS-END
+
+Node-path: dir2
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: dir
+
+
+Node-path: dir2/f
+Node-kind: file
+Node-action: change
+Prop-delta: true
+Prop-content-length: 27
+Prop-content-md5: (prop) 3a6d0284e743dc4a9b86f97d6dd1a3bf
+Prop-content-sha1: (prop) 39f69c278f46165447f30d10acf54277aaa3d5fc
+Content-length: 27
+
+K 4
+prop
+V 3
+val
+PROPS-END
+
+

Re: [PATCH] Import svnsync tests into svnrdump

Posted by Stefan Sperling <st...@elego.de>.
On Tue, Jul 27, 2010 at 12:10:55AM +0530, Ramkumar Ramachandra wrote:
> Hi Stefan,
> 
> I imported and ran the copy_and_modify test from svnsync. The diff I
> get clearly indicates what more needs to be done, and I think this
> test is very valuable. Unfortunately, `svn diff` refuses to show me
> the dumpfile itself (application/octet-stream), so here's the rest of
> the diff along with a log message:
> 
> [[[
> [in subversion/tests/cmdline]
> * svnrdump_tests.py
>   (copy_and_modify): Import new test from svnsync_tests.py.
>   (test_list): Run this test, but expect it to fail.
> * svnrdump_tests_data/copy-and-modify.dump: Add new test data for
>   copy_and_modify test.
> ]]]
> 
> Index: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream

Just remove the svn:mime-type property from the file,
and you should be able to send a complete diff.

Thanks,
Stefan

> Index: svnrdump_tests_data/copy-and-modify.dump
> ===================================================================
> --- subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump	(revision 979365)
> +++ subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump	(working copy)
> 
> Property changes on: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +application/octet-stream
> Index: subversion/tests/cmdline/svnrdump_tests.py
> ===================================================================
> --- subversion/tests/cmdline/svnrdump_tests.py	(revision 979395)
> +++ subversion/tests/cmdline/svnrdump_tests.py	(working copy)
> @@ -98,7 +98,11 @@ def basic_svnrdump(sbox):
>  def revision0(sbox):
>    "dump revision zero"
>    run_test(sbox, dumpfile_name = "revision0.dump")
> -  
> +
> +def copy_and_modify(sbox):
> +  "copy and modify"
> +  run_test(sbox, "copy-and-modify.dump")
> +
>  ########################################################################
>  # Run the tests
>  
> @@ -107,6 +111,7 @@ def revision0(sbox):
>  test_list = [ None,
>                basic_svnrdump,
>                revision0,
> +              XFail(copy_and_modify),
>               ]
>  
>  if __name__ == '__main__':
> 
> 
> --- EXPECTED 
> +++ ACTUAL 
> @@ -33,11 +33,11 @@
>  Node-path: foo.txt
>  Node-kind: file
>  Node-action: add
> +Prop-delta: true
>  Prop-content-length: 10
>  Text-delta: true
>  Text-content-length: 4
>  Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> -Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
>  Content-length: 14
>  
>  PROPS-END
> @@ -67,14 +67,10 @@
>  Node-action: add
>  Node-copyfrom-rev: 1
>  Node-copyfrom-path: foo.txt
> -Text-copy-source-md5: d41d8cd98f00b204e9800998ecf8427e
> -Text-copy-source-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
>  Text-delta: true
>  Text-delta-base-md5: d41d8cd98f00b204e9800998ecf8427e
> -Text-delta-base-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
>  Text-content-length: 19
>  Text-content-md5: d2508118d0d39e198d1129d87d692d59
> -Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020
>  Content-length: 19
>  
>  SVN            modified

Re: [PATCH] Import svnsync tests into svnrdump

Posted by Ramkumar Ramachandra <ar...@gmail.com>.
Hi Stefan,

I imported and ran the copy_and_modify test from svnsync. The diff I
get clearly indicates what more needs to be done, and I think this
test is very valuable. Unfortunately, `svn diff` refuses to show me
the dumpfile itself (application/octet-stream), so here's the rest of
the diff along with a log message:

[[[
[in subversion/tests/cmdline]
* svnrdump_tests.py
  (copy_and_modify): Import new test from svnsync_tests.py.
  (test_list): Run this test, but expect it to fail.
* svnrdump_tests_data/copy-and-modify.dump: Add new test data for
  copy_and_modify test.
]]]

Index: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: svnrdump_tests_data/copy-and-modify.dump
===================================================================
--- subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump	(revision 979365)
+++ subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump	(working copy)

Property changes on: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
Index: subversion/tests/cmdline/svnrdump_tests.py
===================================================================
--- subversion/tests/cmdline/svnrdump_tests.py	(revision 979395)
+++ subversion/tests/cmdline/svnrdump_tests.py	(working copy)
@@ -98,7 +98,11 @@ def basic_svnrdump(sbox):
 def revision0(sbox):
   "dump revision zero"
   run_test(sbox, dumpfile_name = "revision0.dump")
-  
+
+def copy_and_modify(sbox):
+  "copy and modify"
+  run_test(sbox, "copy-and-modify.dump")
+
 ########################################################################
 # Run the tests
 
@@ -107,6 +111,7 @@ def revision0(sbox):
 test_list = [ None,
               basic_svnrdump,
               revision0,
+              XFail(copy_and_modify),
              ]
 
 if __name__ == '__main__':


--- EXPECTED 
+++ ACTUAL 
@@ -33,11 +33,11 @@
 Node-path: foo.txt
 Node-kind: file
 Node-action: add
+Prop-delta: true
 Prop-content-length: 10
 Text-delta: true
 Text-content-length: 4
 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
 Content-length: 14
 
 PROPS-END
@@ -67,14 +67,10 @@
 Node-action: add
 Node-copyfrom-rev: 1
 Node-copyfrom-path: foo.txt
-Text-copy-source-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-copy-source-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
 Text-delta: true
 Text-delta-base-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-delta-base-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
 Text-content-length: 19
 Text-content-md5: d2508118d0d39e198d1129d87d692d59
-Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020
 Content-length: 19
 
 SVN            modified

Re: [PATCH] Import svnsync tests into svnrdump

Posted by Stefan Sperling <st...@elego.de>.
On Mon, Jul 26, 2010 at 05:17:07PM +0530, Ramkumar Ramachandra wrote:
> Hi,
> 
> Ramkumar Ramachandra writes:
> > The tests in svnsync_tests_data/ are in dumpfile v2 and these are
> > unsuitable for testing svnrdump. Hence, load all of them into a
> > repository and re-dump them in dumpfile v3 format before attempting to
> > add them to svnrdump_tests_data/. I still have to figure out how to
> > extend the test framework to ignore certain headers in the diff-

What headers do you want to ignore?

> > currently, using run_test() in svnrdump to run tests corresponding to
> > these files will fail all tests.
> 
> I've discussed this with Daniel on the channel, and I've told him that
> I specifically want this because we don't want svnrdump tests to
> depend on svnadmin. Does anyone object to this patch? It was created
> by dumping the data in svn-test-data/ after running svnsync_tests.py.
> 
> Thanks.


As long as we still try to make svnrdump output make svnadmin dump output
match as much as possible, I don't object to adding v3 dump files for
svnrdump tests. That's obviously necessary because svnrdump can only do v3.

But I'd rather like this to be done one step at a time.
Please don't import test data that isn't used. Write the test using
the data, and then add the data along with the (passing or xfailing) test.

So I'd like to see a new diff with test+data before I can give a +1.
Preferably one diff per test.

Stefan

Re: [PATCH] Import svnsync tests into svnrdump

Posted by Ramkumar Ramachandra <ar...@gmail.com>.
Hi,

Ramkumar Ramachandra writes:
> The tests in svnsync_tests_data/ are in dumpfile v2 and these are
> unsuitable for testing svnrdump. Hence, load all of them into a
> repository and re-dump them in dumpfile v3 format before attempting to
> add them to svnrdump_tests_data/. I still have to figure out how to
> extend the test framework to ignore certain headers in the diff-
> currently, using run_test() in svnrdump to run tests corresponding to
> these files will fail all tests.

I've discussed this with Daniel on the channel, and I've told him that
I specifically want this because we don't want svnrdump tests to
depend on svnadmin. Does anyone object to this patch? It was created
by dumping the data in svn-test-data/ after running svnsync_tests.py.

Thanks.

-- Ram