Don't forget notes/dump-load-format.txt.
--dave
On Sat, Nov 22, 2008 at 8:08 PM, <hwright_at_tigris.org> wrote:
> Author: hwright
> Date: Sat Nov 22 20:08:04 2008
> New Revision: 34352
>
> Log:
> When creating a dump file, include the sha1 checksum as well as the md5.
>
> We don't actually parse or use the sha1 at this point, thought we could. The
> md5 is used at the repos layer to check corruption, and later passed to the fs
> layer for the same reason. If we ever switch the entire system over to sha1,
> this patch will mean that 1.6-era dumpfiles will have sha1 data usable by
> future versions of Subversion.
>
> * subversion/include/svn_repos.h
> (SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5,
> SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1,
> SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5,
> SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1,
> SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5
> SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1): New.
> (SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM,
> SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM,
> SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM): Use the md5 define.
>
> * subversion/libsvn_repos/dump.c
> (dump_node): Include the sha1 in the dumpfile.
>
> [ in subversion/tests/cmdline/svnsync_tests_data/ ]
> Fix up assorted dump files to include the now-expected sha1 field.
>
> Modified:
> trunk/subversion/include/svn_repos.h
> trunk/subversion/libsvn_repos/dump.c
> trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
> trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
>
> Modified: trunk/subversion/include/svn_repos.h
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/include/svn_repos.h?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/include/svn_repos.h Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/include/svn_repos.h Sat Nov 22 20:08:04 2008 (r34352)
> @@ -2030,8 +2030,14 @@ svn_repos_node_from_baton(void *edit_bat
> #define SVN_REPOS_DUMPFILE_NODE_ACTION "Node-action"
> #define SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH "Node-copyfrom-path"
> #define SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV "Node-copyfrom-rev"
> -#define SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM "Text-copy-source-md5"
> -#define SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM "Text-content-md5"
> +#define SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5 "Text-copy-source-md5"
> +#define SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1 "Text-copy-source-sha1"
> +#define SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM \
> + SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5
> +#define SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5 "Text-content-md5"
> +#define SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1 "Text-content-sha1"
> +#define SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM \
> + SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5
>
> #define SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH "Prop-content-length"
> #define SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH "Text-content-length"
> @@ -2041,7 +2047,10 @@ svn_repos_node_from_baton(void *edit_bat
> /* @since New in 1.1. */
> #define SVN_REPOS_DUMPFILE_TEXT_DELTA "Text-delta"
> /* @since New in 1.5. */
> -#define SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM "Text-delta-base-md5"
> +#define SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5 "Text-delta-base-md5"
> +#define SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1 "Text-delta-base-sha1"
> +#define SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM \
> + SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5
>
> /** The different "actions" attached to nodes in the dumpfile. */
> enum svn_node_action
>
> Modified: trunk/subversion/libsvn_repos/dump.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_repos/dump.c?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/libsvn_repos/dump.c Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/libsvn_repos/dump.c Sat Nov 22 20:08:04 2008 (r34352)
> @@ -450,8 +450,17 @@ dump_node(struct edit_baton *eb,
> hex_digest = svn_checksum_to_cstring(checksum, pool);
> if (hex_digest)
> SVN_ERR(svn_stream_printf(eb->stream, pool,
> - SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM
> - ": %s\n", hex_digest));
> + SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5
> + ": %s\n", hex_digest));
> +
> + SVN_ERR(svn_fs_file_checksum(&checksum, svn_checksum_sha1,
> + compare_root, compare_path,
> + TRUE, pool));
> + hex_digest = svn_checksum_to_cstring(checksum, pool);
> + if (hex_digest)
> + SVN_ERR(svn_stream_printf(eb->stream, pool,
> + SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1
> + ": %s\n", hex_digest));
> }
> }
> }
> @@ -523,8 +532,17 @@ dump_node(struct edit_baton *eb,
> hex_digest = svn_checksum_to_cstring(checksum, pool);
> if (hex_digest)
> SVN_ERR(svn_stream_printf(eb->stream, pool,
> - SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM
> + SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5
> ": %s\n", hex_digest));
> +
> + SVN_ERR(svn_fs_file_checksum(&checksum, svn_checksum_sha1,
> + compare_root, compare_path,
> + TRUE, pool));
> + hex_digest = svn_checksum_to_cstring(checksum, pool);
> + if (hex_digest)
> + SVN_ERR(svn_stream_printf(eb->stream, pool,
> + SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1
> + ": %s\n", hex_digest));
> }
> }
> else
> @@ -543,7 +561,15 @@ dump_node(struct edit_baton *eb,
> hex_digest = svn_checksum_to_cstring(checksum, pool);
> if (hex_digest)
> SVN_ERR(svn_stream_printf(eb->stream, pool,
> - SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM
> + SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5
> + ": %s\n", hex_digest));
> +
> + SVN_ERR(svn_fs_file_checksum(&checksum, svn_checksum_sha1,
> + eb->fs_root, path, TRUE, pool));
> + hex_digest = svn_checksum_to_cstring(checksum, pool);
> + if (hex_digest)
> + SVN_ERR(svn_stream_printf(eb->stream, pool,
> + SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1
> ": %s\n", hex_digest));
> }
>
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -36,6 +36,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 0
> Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
> Content-length: 10
>
> PROPS-END
> @@ -66,8 +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-content-length: 9
> Text-content-md5: d2508118d0d39e198d1129d87d692d59
> +Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020
> Content-length: 9
>
> modified
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -82,6 +82,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 14
> Text-content-md5: 9f089b639127e2f5a79c4eda189678d6
> +Text-content-sha1: b1c2f43edab746cec4857f5d4b00579922a83d92
> Content-length: 24
>
> PROPS-END
> @@ -112,6 +113,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 15
> Text-content-md5: 27f60b341727cb8ed1de139b0da7c173
> +Text-content-sha1: b61e81f23c338df5c1dff26963f755d4226227c6
> Content-length: 15
>
> second version
> @@ -142,8 +144,10 @@ Node-action: add
> Node-copyfrom-rev: 2
> Node-copyfrom-path: trunk/file.txt
> Text-copy-source-md5: 9f089b639127e2f5a79c4eda189678d6
> +Text-copy-source-sha1: b1c2f43edab746cec4857f5d4b00579922a83d92
> Text-content-length: 28
> Text-content-md5: 7b4d0f5ac875af39d2ee3a67798f5754
> +Text-content-sha1: 2040e27d431428a216382b42560dccaaa5e1b3b6
> Content-length: 28
>
> first version, but modified
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -83,6 +83,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 22
> Text-content-md5: bb55f6530f359710b6e52f0d5a9f544f
> +Text-content-sha1: df4f5675e945ac7f4a776cb068aeb3bc5fb5fd29
> Content-length: 32
>
> PROPS-END
> @@ -113,6 +114,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 23
> Text-content-md5: d6e0e9fdc2cb38352eca81f093110f4b
> +Text-content-sha1: 64f3eeab9a2fce6b19eec365bbb181561718b999
> Content-length: 23
>
> second version of file
> @@ -143,6 +145,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 0
> Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
> Content-length: 10
>
> PROPS-END
> @@ -173,5 +176,6 @@ Node-action: add
> Node-copyfrom-rev: 2
> Node-copyfrom-path: trunk/file.txt
> Text-copy-source-md5: bb55f6530f359710b6e52f0d5a9f544f
> +Text-copy-source-sha1: df4f5675e945ac7f4a776cb068aeb3bc5fb5fd29
>
>
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -45,6 +45,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 0
> Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
> Content-length: 10
>
> PROPS-END
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -36,6 +36,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 0
> Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
> Content-length: 10
>
> PROPS-END
> @@ -56,6 +57,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 0
> Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
> Content-length: 10
>
> PROPS-END
> @@ -67,6 +69,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 0
> Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
> +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
> Content-length: 10
>
> PROPS-END
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -37,6 +37,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 15
> Text-content-md5: 26bb73556ceb32a5df30b733c5355ee5
> +Text-content-sha1: 1c8c6df57252f0cc13dd2d763f4aef9affe1817c
> Content-length: 25
>
> PROPS-END
> @@ -66,6 +67,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 38
> Text-content-md5: d9bf46ecc7a555936e5115241b93258b
> +Text-content-sha1: 1586ddcffca1e5f724b0eea7bb9d6b41f67c7ba6
> Content-length: 38
>
> this is a file
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -44,6 +44,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 25
> Text-content-md5: 9b43d872d923f848f999ff12f64adb67
> +Text-content-sha1: c12ea8cefa562bf697f9d5e20329b695b97fcba7
> Content-length: 35
>
> PROPS-END
> @@ -110,6 +111,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 8ac35a19435b31b928de300b32e930cd
> +Text-content-sha1: b3f85be4422626e7443b6ddcf60bb451dc7f0560
> Content-length: 42
>
> PROPS-END
> @@ -122,6 +124,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 31
> Text-content-md5: de856b65f58804c29698ac73c77afca0
> +Text-content-sha1: 9fd481a7c856d5e99c912b14df12ca436ec87ab8
> Content-length: 41
>
> PROPS-END
> @@ -143,6 +146,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 31
> Text-content-md5: 74465fc532ca0c4a59782434fef78950
> +Text-content-sha1: 4806e0b7d66e8de981613285ba82f1074419ac12
> Content-length: 41
>
> PROPS-END
> @@ -182,6 +186,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 29
> Text-content-md5: 9f6400f63c4dcd2e4f140b3eef1a323a
> +Text-content-sha1: 76ca412fe5b6de13ab0ae4afa9b0c4b5722cdf41
> Content-length: 39
>
> PROPS-END
> @@ -194,6 +199,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 14d1e17286af96fd468e68aea4b9148a
> +Text-content-sha1: c6727fc45f4251276a957ff3e4b089ee3cc89a0e
> Content-length: 40
>
> PROPS-END
> @@ -206,6 +212,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 2c41dafbd4d5735e1065b49b009ef0fd
> +Text-content-sha1: 25e0fbfcac72ddc25bb5c677aea6676329cb9fac
> Content-length: 40
>
> PROPS-END
> @@ -227,6 +234,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 1d434602d24db956f1c481397340798f
> +Text-content-sha1: 9b8aba1e49297c4842b87dca754a1692d58f8c96
> Content-length: 40
>
> PROPS-END
> @@ -239,6 +247,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 60561894aaf380df0d211aba60149262
> +Text-content-sha1: 521fe6f78f95558a5069cbc65e75185f20a5792c
> Content-length: 42
>
> PROPS-END
> @@ -251,6 +260,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f70dc430061ce3e0ddd98783ff0b451a
> +Text-content-sha1: e2ca5cc8621b52accf604fbf1ef27144bdf89542
> Content-length: 40
>
> PROPS-END
> @@ -263,6 +273,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f626c0bd25c0aed96c78917a653ed5c1
> +Text-content-sha1: 9ca20fa69244b6352a4785b7e8dc9a76bdd61fa3
> Content-length: 40
>
> PROPS-END
> @@ -275,6 +286,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 25
> Text-content-md5: cbf47443741fa5692f3fe90a9e6532a6
> +Text-content-sha1: 3c685125ea46ecb8b1f993f328a753fb2bd75b06
> Content-length: 35
>
> PROPS-END
> @@ -287,6 +299,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 25
> Text-content-md5: 2d18c5e57e84c5b8a5e9a6e13fa394dc
> +Text-content-sha1: 2c0aa9014a0cd07f01795a333d82485ef6d083e2
> Content-length: 35
>
> PROPS-END
> @@ -316,6 +329,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 48
> Text-content-md5: 25969dfd7f76f630537591ab115d3188
> +Text-content-sha1: 14640f53cbdfb55706234cbaa2b3d244ad56c2a7
> Content-length: 48
>
> This is the file 'A/D/H/psi'.
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -135,6 +135,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 22
> Text-content-md5: fe0e7568a5195cc8a2d60ebf93d93c5b
> +Text-content-sha1: 07788068d2ea1f14b0e77ffcd1fac64a6049ab2e
> Content-length: 32
>
> PROPS-END
> @@ -166,6 +167,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 23
> Text-content-md5: f3659a1913324affa5d9ddc7451ce7a8
> +Text-content-sha1: f27493e177fceaf3b7d25a5f28dcc194aebca0a9
> Content-length: 33
>
> PROPS-END
> @@ -253,6 +255,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 42
> Text-content-md5: c69eb9f5054332e29a5e46a80bd3980d
> +Text-content-sha1: 910ccaa860667c5216776f8aa479c1177d02df6d
> Content-length: 42
>
> content for file.txt
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -90,6 +90,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 8ac35a19435b31b928de300b32e930cd
> +Text-content-sha1: b3f85be4422626e7443b6ddcf60bb451dc7f0560
> Content-length: 42
>
> PROPS-END
> @@ -102,6 +103,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 31
> Text-content-md5: de856b65f58804c29698ac73c77afca0
> +Text-content-sha1: 9fd481a7c856d5e99c912b14df12ca436ec87ab8
> Content-length: 41
>
> PROPS-END
> @@ -123,6 +125,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 31
> Text-content-md5: 74465fc532ca0c4a59782434fef78950
> +Text-content-sha1: 4806e0b7d66e8de981613285ba82f1074419ac12
> Content-length: 41
>
> PROPS-END
> @@ -162,6 +165,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 29
> Text-content-md5: 9f6400f63c4dcd2e4f140b3eef1a323a
> +Text-content-sha1: 76ca412fe5b6de13ab0ae4afa9b0c4b5722cdf41
> Content-length: 39
>
> PROPS-END
> @@ -174,6 +178,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 14d1e17286af96fd468e68aea4b9148a
> +Text-content-sha1: c6727fc45f4251276a957ff3e4b089ee3cc89a0e
> Content-length: 40
>
> PROPS-END
> @@ -186,6 +191,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 2c41dafbd4d5735e1065b49b009ef0fd
> +Text-content-sha1: 25e0fbfcac72ddc25bb5c677aea6676329cb9fac
> Content-length: 40
>
> PROPS-END
> @@ -207,6 +213,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 1d434602d24db956f1c481397340798f
> +Text-content-sha1: 9b8aba1e49297c4842b87dca754a1692d58f8c96
> Content-length: 40
>
> PROPS-END
> @@ -219,6 +226,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 60561894aaf380df0d211aba60149262
> +Text-content-sha1: 521fe6f78f95558a5069cbc65e75185f20a5792c
> Content-length: 42
>
> PROPS-END
> @@ -231,6 +239,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f70dc430061ce3e0ddd98783ff0b451a
> +Text-content-sha1: e2ca5cc8621b52accf604fbf1ef27144bdf89542
> Content-length: 40
>
> PROPS-END
> @@ -243,6 +252,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f626c0bd25c0aed96c78917a653ed5c1
> +Text-content-sha1: 9ca20fa69244b6352a4785b7e8dc9a76bdd61fa3
> Content-length: 40
>
> PROPS-END
> @@ -255,6 +265,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 25
> Text-content-md5: cbf47443741fa5692f3fe90a9e6532a6
> +Text-content-sha1: 3c685125ea46ecb8b1f993f328a753fb2bd75b06
> Content-length: 35
>
> PROPS-END
> @@ -284,6 +295,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 48
> Text-content-md5: 25969dfd7f76f630537591ab115d3188
> +Text-content-sha1: 14640f53cbdfb55706234cbaa2b3d244ad56c2a7
> Content-length: 48
>
> This is the file 'A/D/H/psi'.
> @@ -385,6 +397,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 29
> Text-content-md5: 9f6400f63c4dcd2e4f140b3eef1a323a
> +Text-content-sha1: 76ca412fe5b6de13ab0ae4afa9b0c4b5722cdf41
> Content-length: 39
>
> PROPS-END
> @@ -397,6 +410,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 14d1e17286af96fd468e68aea4b9148a
> +Text-content-sha1: c6727fc45f4251276a957ff3e4b089ee3cc89a0e
> Content-length: 40
>
> PROPS-END
> @@ -409,6 +423,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 2c41dafbd4d5735e1065b49b009ef0fd
> +Text-content-sha1: 25e0fbfcac72ddc25bb5c677aea6676329cb9fac
> Content-length: 40
>
> PROPS-END
> @@ -430,6 +445,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 1d434602d24db956f1c481397340798f
> +Text-content-sha1: 9b8aba1e49297c4842b87dca754a1692d58f8c96
> Content-length: 40
>
> PROPS-END
> @@ -442,6 +458,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 60561894aaf380df0d211aba60149262
> +Text-content-sha1: 521fe6f78f95558a5069cbc65e75185f20a5792c
> Content-length: 42
>
> PROPS-END
> @@ -454,6 +471,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 48
> Text-content-md5: 25969dfd7f76f630537591ab115d3188
> +Text-content-sha1: 14640f53cbdfb55706234cbaa2b3d244ad56c2a7
> Content-length: 58
>
> PROPS-END
> @@ -467,6 +485,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f626c0bd25c0aed96c78917a653ed5c1
> +Text-content-sha1: 9ca20fa69244b6352a4785b7e8dc9a76bdd61fa3
> Content-length: 40
>
> PROPS-END
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -90,6 +90,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 8ac35a19435b31b928de300b32e930cd
> +Text-content-sha1: b3f85be4422626e7443b6ddcf60bb451dc7f0560
> Content-length: 42
>
> PROPS-END
> @@ -102,6 +103,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 31
> Text-content-md5: de856b65f58804c29698ac73c77afca0
> +Text-content-sha1: 9fd481a7c856d5e99c912b14df12ca436ec87ab8
> Content-length: 41
>
> PROPS-END
> @@ -123,6 +125,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 31
> Text-content-md5: 74465fc532ca0c4a59782434fef78950
> +Text-content-sha1: 4806e0b7d66e8de981613285ba82f1074419ac12
> Content-length: 41
>
> PROPS-END
> @@ -162,6 +165,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 29
> Text-content-md5: 9f6400f63c4dcd2e4f140b3eef1a323a
> +Text-content-sha1: 76ca412fe5b6de13ab0ae4afa9b0c4b5722cdf41
> Content-length: 39
>
> PROPS-END
> @@ -174,6 +178,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 14d1e17286af96fd468e68aea4b9148a
> +Text-content-sha1: c6727fc45f4251276a957ff3e4b089ee3cc89a0e
> Content-length: 40
>
> PROPS-END
> @@ -186,6 +191,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 2c41dafbd4d5735e1065b49b009ef0fd
> +Text-content-sha1: 25e0fbfcac72ddc25bb5c677aea6676329cb9fac
> Content-length: 40
>
> PROPS-END
> @@ -207,6 +213,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: 1d434602d24db956f1c481397340798f
> +Text-content-sha1: 9b8aba1e49297c4842b87dca754a1692d58f8c96
> Content-length: 40
>
> PROPS-END
> @@ -219,6 +226,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 32
> Text-content-md5: 60561894aaf380df0d211aba60149262
> +Text-content-sha1: 521fe6f78f95558a5069cbc65e75185f20a5792c
> Content-length: 42
>
> PROPS-END
> @@ -231,6 +239,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f70dc430061ce3e0ddd98783ff0b451a
> +Text-content-sha1: e2ca5cc8621b52accf604fbf1ef27144bdf89542
> Content-length: 40
>
> PROPS-END
> @@ -243,6 +252,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 30
> Text-content-md5: f626c0bd25c0aed96c78917a653ed5c1
> +Text-content-sha1: 9ca20fa69244b6352a4785b7e8dc9a76bdd61fa3
> Content-length: 40
>
> PROPS-END
> @@ -255,6 +265,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 25
> Text-content-md5: cbf47443741fa5692f3fe90a9e6532a6
> +Text-content-sha1: 3c685125ea46ecb8b1f993f328a753fb2bd75b06
> Content-length: 35
>
> PROPS-END
> @@ -267,6 +278,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 25
> Text-content-md5: 2d18c5e57e84c5b8a5e9a6e13fa394dc
> +Text-content-sha1: 2c0aa9014a0cd07f01795a333d82485ef6d083e2
> Content-length: 35
>
> PROPS-END
> @@ -296,6 +308,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 48
> Text-content-md5: 25969dfd7f76f630537591ab115d3188
> +Text-content-sha1: 14640f53cbdfb55706234cbaa2b3d244ad56c2a7
> Content-length: 48
>
> This is the file 'A/D/H/psi'.
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -81,6 +81,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 16
> Text-content-md5: 0bebeeefa6853d064099b54a81a627e8
> +Text-content-sha1: b78087338d3daf51e667056c78fd8089bb51d5ec
> Content-length: 26
>
> PROPS-END
> @@ -119,5 +120,6 @@ Node-action: add
> Node-copyfrom-rev: 2
> Node-copyfrom-path: trunk/foo.txt
> Text-copy-source-md5: 0bebeeefa6853d064099b54a81a627e8
> +Text-copy-source-sha1: b78087338d3daf51e667056c78fd8089bb51d5ec
>
>
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -81,6 +81,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 16
> Text-content-md5: 98475036dc73d318982805bf4b16e8b2
> +Text-content-sha1: d7dff2b1ef48b9c20c23d7b3a08b557957cec3c9
> Content-length: 26
>
> PROPS-END
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -82,6 +82,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 8
> Text-content-md5: 2973ad11c859f59a44bf3ae776a346b1
> +Text-content-sha1: ac657117c81fad228ccdb8c6d0861bdafca9ba3c
> Content-length: 18
>
> PROPS-END
> @@ -119,6 +120,7 @@ Node-kind: file
> Node-action: change
> Text-content-length: 17
> Text-content-md5: 30ec0b35cc9c19332cbab42768cf5df6
> +Text-content-sha1: c7197a5efb7afcc64f713f7718f0ab1638f2098b
> Content-length: 17
>
> a modified file.
>
> Modified: trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump?pathrev=34352&r1=34351&r2=34352
> ==============================================================================
> --- trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump Sat Nov 22 19:49:53 2008 (r34351)
> +++ trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump Sat Nov 22 20:08:04 2008 (r34352)
> @@ -36,6 +36,7 @@ Node-action: add
> Prop-content-length: 10
> Text-content-length: 15
> Text-content-md5: e58d666df0d6cc6e87a7e48440d637e9
> +Text-content-sha1: ca53b1f604b633a6bc3cf75325932596efc4717f
> Content-length: 25
>
> PROPS-END
> @@ -66,6 +67,7 @@ Node-action: add
> Node-copyfrom-rev: 1
> Node-copyfrom-path: foo%20bar.txt
> Text-copy-source-md5: e58d666df0d6cc6e87a7e48440d637e9
> +Text-copy-source-sha1: ca53b1f604b633a6bc3cf75325932596efc4717f
>
>
> Node-path: foo%20bar.txt
> @@ -96,6 +98,7 @@ Node-action: add
> Node-copyfrom-rev: 2
> Node-copyfrom-path: foo bar.txt
> Text-copy-source-md5: e58d666df0d6cc6e87a7e48440d637e9
> +Text-copy-source-sha1: ca53b1f604b633a6bc3cf75325932596efc4717f
>
>
> Node-path: foo bar.txt
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-23 05:58:38 CET