Author: stsp Date: Wed Jul 21 23:06:26 2010 New Revision: 966458 URL: http://svn.apache.org/viewvc?rev=966458&view=rev Log: Remove a redundant helper function from libsvn_repos/dump.c.
Instead of printing the human-readable form of property hashes with a static helper function, use the generic functions from svn_hash.h which were designed for the very same task and produce virtually the same output. The only visible effect of this change is that (key, value) pairs of hashes are now printed in a different order (in alphabetical order of keys). * subversion/libsvn_repos/dump.c (write_hash_to_stringbuf): Remove. (dump_node, write_revision_record): Call svn_hash_write_incremental() and svn_hash_write2() instead of write_hash_to_stringbuf(). [ in subversion/tests/cmdline/svnsync_tests_data/ ] * svnsync-trunk-only.dump, svnsync-trunk-A-changes.dump, copy-bad-line-endings.dump, descend_into_replace.dump, no-author.dump, tag-with-modified-file.dump, repo_with_copy_of_root_dir.dump, revprops.dump, svnsync-trunk-only.expected.dump, dir_prop_change.dump, tag-trunk-with-file2.dump, svnsync-trunk-A-changes.expected.dump, descend_into_replace.expected.dump, svnsync-move-and-modify.dump, copy-from-previous-version-and-modify.dump, copy-and-modify.dump, tag-trunk-with-dir.dump, url-encoding-bug.dump, tag-trunk-with-file.dump, copy-parent-modify-prop.dump, modified-in-place.dump, delete-svn-props.dump, file-dir-file.dump, copy-from-previous-version.dump, copy-bad-line-endings.expected.dump, tag-empty-trunk.dump: Adjust expected output. Modified: subversion/trunk/subversion/libsvn_repos/dump.c subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/no-author.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump Modified: subversion/trunk/subversion/libsvn_repos/dump.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/dump.c (original) +++ subversion/trunk/subversion/libsvn_repos/dump.c Wed Jul 21 23:06:26 2010 @@ -25,6 +25,7 @@ #include "svn_pools.h" #include "svn_error.h" #include "svn_fs.h" +#include "svn_hash.h" #include "svn_iter.h" #include "svn_repos.h" #include "svn_string.h" @@ -40,92 +41,6 @@ /*----------------------------------------------------------------------*/ -/** A variant of our hash-writing routine in libsvn_subr; this one - writes to a stringbuf instead of a file, and outputs PROPS-END - instead of END. If OLDHASH is not NULL, then only properties - which vary from OLDHASH will be written, and properties which - exist only in OLDHASH will be written out with "D" entries - (like "K" entries but with no corresponding value). **/ - -static void -write_hash_to_stringbuf(apr_hash_t *hash, - apr_hash_t *oldhash, - svn_stringbuf_t **strbuf, - apr_pool_t *pool) -{ - apr_hash_index_t *this; /* current hash entry */ - - *strbuf = svn_stringbuf_create("", pool); - - for (this = apr_hash_first(pool, hash); this; this = apr_hash_next(this)) - { - const void *key; - void *val; - apr_ssize_t keylen; - svn_string_t *value; - - /* Get this key and val. */ - apr_hash_this(this, &key, &keylen, &val); - value = val; - - /* Don't output properties equal to the ones in oldhash, if present. */ - if (oldhash) - { - svn_string_t *oldvalue = apr_hash_get(oldhash, key, keylen); - - if (oldvalue && svn_string_compare(value, oldvalue)) - continue; - } - - /* Output name length, then name. */ - - svn_stringbuf_appendcstr(*strbuf, - apr_psprintf(pool, "K %" APR_SSIZE_T_FMT "\n", - keylen)); - - svn_stringbuf_appendbytes(*strbuf, (const char *) key, keylen); - svn_stringbuf_appendbytes(*strbuf, "\n", 1); - - /* Output value length, then value. */ - - svn_stringbuf_appendcstr(*strbuf, - apr_psprintf(pool, "V %" APR_SIZE_T_FMT "\n", - value->len)); - - svn_stringbuf_appendbytes(*strbuf, value->data, value->len); - svn_stringbuf_appendbytes(*strbuf, "\n", 1); - } - - if (oldhash) - { - /* Output a "D " entry for each property in oldhash but not hash. */ - for (this = apr_hash_first(pool, oldhash); this; - this = apr_hash_next(this)) - { - const void *key; - apr_ssize_t keylen; - - /* Get this key. */ - apr_hash_this(this, &key, &keylen, NULL); - - /* Only output values deleted in hash. */ - if (apr_hash_get(hash, key, keylen)) - continue; - - /* Output name length, then name. */ - - svn_stringbuf_appendcstr(*strbuf, - apr_psprintf(pool, - "D %" APR_SSIZE_T_FMT "\n", - keylen)); - - svn_stringbuf_appendbytes(*strbuf, (const char *) key, keylen); - svn_stringbuf_appendbytes(*strbuf, "\n", 1); - } - } - svn_stringbuf_appendbytes(*strbuf, "PROPS-END\n", 10); -} - /* Compute the delta between OLDROOT/OLDPATH and NEWROOT/NEWPATH and store it into a new temporary file *TEMPFILE. OLDROOT may be NULL, @@ -556,6 +471,7 @@ dump_node(struct edit_baton *eb, { apr_hash_t *prophash, *oldhash = NULL; apr_size_t proplen; + svn_stream_t *propstream; SVN_ERR(svn_fs_node_proplist(&prophash, eb->fs_root, path, pool)); @@ -606,7 +522,13 @@ dump_node(struct edit_baton *eb, SVN_REPOS_DUMPFILE_PROP_DELTA ": true\n")); } - write_hash_to_stringbuf(prophash, oldhash, &propstring, pool); + else + oldhash = apr_hash_make(pool); + propstring = svn_stringbuf_create_ensure(0, pool); + propstream = svn_stream_from_stringbuf(propstring, pool); + svn_hash_write_incremental(prophash, oldhash, propstream, "PROPS-END", + pool); + SVN_ERR(svn_stream_close(propstream)); proplen = propstring->len; content_length += proplen; SVN_ERR(svn_stream_printf(eb->stream, pool, @@ -1010,6 +932,7 @@ write_revision_record(svn_stream_t *stre svn_stringbuf_t *encoded_prophash; apr_time_t timetemp; svn_string_t *datevalue; + svn_stream_t *propstream; /* Read the revision props even if we're aren't going to dump them for verification purposes */ @@ -1029,7 +952,10 @@ write_revision_record(svn_stream_t *stre datevalue); } - write_hash_to_stringbuf(props, NULL, &encoded_prophash, pool); + encoded_prophash = svn_stringbuf_create_ensure(0, pool); + propstream = svn_stream_from_stringbuf(encoded_prophash, pool); + svn_hash_write2(props, propstream, "PROPS-END", pool); + SVN_ERR(svn_stream_close(propstream)); /* ### someday write a revision-content-checksum */ Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 82b427150f1 Prop-content-sha1: (svn:date) 0da5c3bee3e0d93cbe0d7094973bb169db5f184f Content-length: 112 -K 7 -svn:log -V 11 -add foo.txt K 10 svn:author V 6 @@ -36,6 +32,10 @@ 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 @@ -60,11 +60,6 @@ Prop-content-md5: (svn:date) 822d6ff42b9 Prop-content-sha1: (svn:date) 1192c3c4f4a4af789ef996b3f7cdc3cce4e3484e Content-length: 135 -K 7 -svn:log -V 34 -copy and change at the same time. - K 10 svn:author V 6 @@ -73,6 +68,11 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump Wed Jul 21 23:06:26 2010 @@ -16,11 +16,6 @@ Revision-number: 1 Prop-content-length: 151 Content-length: 151 -K 7 -svn:log -V 49 -added svn:ignore using CRLF to terminate lines - K 10 svn:author V 7 @@ -29,6 +24,11 @@ K 8 svn:date V 27 2009-03-27T19:33:51.178381Z +K 7 +svn:log +V 49 +added svn:ignore using CRLF to terminate lines + PROPS-END Node-path: Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump Wed Jul 21 23:06:26 2010 @@ -24,12 +24,6 @@ Prop-content-md5: (svn:date) dc15c87f7ae Prop-content-sha1: (svn:date) ac67780acd8acbfc2e0c266aa3ec08cbccc623d9 Content-length: 150 -K 7 -svn:log -V 48 -added svn:ignore using CRLF to - terminate lines - K 10 svn:author V 7 @@ -38,6 +32,12 @@ K 8 svn:date V 27 2009-03-27T19:33:51.178381Z +K 7 +svn:log +V 48 +added svn:ignore using CRLF to + terminate lines + PROPS-END Node-path: Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 4c704226217 Prop-content-sha1: (svn:date) d9f19ca5f3ec340dd8f12b69519b2e4fd09c8a84 Content-length: 103 -K 7 -svn:log -V 3 -ttb K 10 svn:author V 6 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2005-11-15T21:10:58.608841Z +K 7 +svn:log +V 3 +ttb PROPS-END Node-path: branches @@ -75,11 +75,6 @@ Prop-content-md5: (svn:date) b2e92f1550a Prop-content-sha1: (svn:date) f41a4e0c5eaae0b7102290ac93f6d388adc87e39 Content-length: 116 -K 7 -svn:log -V 15 -first version! - K 10 svn:author V 6 @@ -88,6 +83,11 @@ 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 @@ -113,11 +113,6 @@ Prop-content-md5: (svn:date) 48458d34115 Prop-content-sha1: (svn:date) 324d729438bf679dfce060d0bb490cd91e1ae122 Content-length: 117 -K 7 -svn:log -V 16 -second version! - K 10 svn:author V 6 @@ -126,6 +121,11 @@ 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 @@ -149,11 +149,6 @@ Prop-content-md5: (svn:date) cc777234c61 Prop-content-sha1: (svn:date) 52e42bc0954bf4e2045fc5ca3c6deb8c6fa0ee8f Content-length: 122 -K 7 -svn:log -V 21 -a copy, but modified - K 10 svn:author V 6 @@ -162,6 +157,11 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump Wed Jul 21 23:06:26 2010 @@ -24,11 +24,6 @@ Prop-content-md5: (svn:date) 1fe09cb2b90 Prop-content-sha1: (svn:date) 1459fb9c21694e991ab3b2e583a4066efe9387bc Content-length: 104 -K 7 -svn:log -V 4 -ttb - K 10 svn:author V 6 @@ -37,6 +32,11 @@ K 8 svn:date V 27 2005-11-15T20:53:08.484681Z +K 7 +svn:log +V 4 +ttb + PROPS-END Node-path: branches @@ -76,11 +76,6 @@ Prop-content-md5: (svn:date) 0d616763dde Prop-content-sha1: (svn:date) 15ad3d0c864290db9de4df7517643b3fd5281f5b Content-length: 119 -K 7 -svn:log -V 18 -Add first version - K 10 svn:author V 6 @@ -89,6 +84,11 @@ 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 @@ -114,11 +114,6 @@ Prop-content-md5: (svn:date) c8502d1e031 Prop-content-sha1: (svn:date) 450ec68bc28624f7d50c5bfc7d5090f9c352fb83 Content-length: 120 -K 7 -svn:log -V 19 -Add second version - K 10 svn:author V 6 @@ -127,6 +122,11 @@ 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 @@ -150,11 +150,6 @@ Prop-content-md5: (svn:date) b99bb052f93 Prop-content-sha1: (svn:date) 5707a472c230b623311bb502ef78c68f2ef5ded4 Content-length: 149 -K 7 -svn:log -V 48 -Add a new file to create an uninvolved revision - K 10 svn:author V 6 @@ -163,6 +158,11 @@ 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 @@ -187,11 +187,6 @@ Prop-content-md5: (svn:date) a035f965a49 Prop-content-sha1: (svn:date) 497960a480336a4afe102b3da3bd55b7e0f329e6 Content-length: 131 -K 7 -svn:log -V 30 -copy from a previous revision - K 10 svn:author V 6 @@ -200,6 +195,11 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) cb206ac7669 Prop-content-sha1: (svn:date) ed9527991cf785cdb071bdce4de1c5b40820c37a Content-length: 113 -K 7 -svn:log -V 16 -add dir and file K 10 svn:author V 2 @@ -36,6 +32,10 @@ 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 @@ -69,10 +69,6 @@ Prop-content-md5: (svn:date) ff6b2f46707 Prop-content-sha1: (svn:date) bf4df558ea209dba9f93a3464022cde10e9b4e0f Content-length: 126 -K 7 -svn:log -V 29 -copy dir and modify prop of f K 10 svn:author V 2 @@ -81,6 +77,10 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) d3eb2d2ffe4 Prop-content-sha1: (svn:date) 3a4b04ed1626b7d0fc91a015d72a834fda180838 Content-length: 137 -K 7 -svn:log -V 37 -adding file with prop 'svn:eol-style' K 10 svn:author V 5 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2009-06-05T14:23:41.185914Z +K 7 +svn:log +V 37 +adding file with prop 'svn:eol-style' PROPS-END Node-path: file @@ -67,10 +67,6 @@ Prop-content-md5: (svn:date) 11acbf8a3ca Prop-content-sha1: (svn:date) 07c52cfe8bc8cfb117a83838e2bafba514780118 Content-length: 139 -K 7 -svn:log -V 39 -removing prop 'svn:eol-style' from file K 10 svn:author V 5 @@ -79,6 +75,10 @@ K 8 svn:date V 27 2009-06-05T14:23:42.140849Z +K 7 +svn:log +V 39 +removing prop 'svn:eol-style' from file PROPS-END Node-path: file Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump Wed Jul 21 23:06:26 2010 @@ -16,10 +16,6 @@ Revision-number: 1 Prop-content-length: 133 Content-length: 133 -K 7 -svn:log -V 32 -Import the Greek Tree to /trunk. K 10 svn:author V 6 @@ -28,6 +24,10 @@ K 8 svn:date V 27 2008-06-14T09:28:38.718750Z +K 7 +svn:log +V 32 +Import the Greek Tree to /trunk. PROPS-END Node-path: branches @@ -289,10 +289,6 @@ Revision-number: 2 Prop-content-length: 105 Content-length: 105 -K 7 -svn:log -V 5 -add X K 10 svn:author V 6 @@ -301,6 +297,10 @@ K 8 svn:date V 27 2010-07-08T21:22:47.484375Z +K 7 +svn:log +V 5 +add X PROPS-END Node-path: trunk/X @@ -316,10 +316,6 @@ Revision-number: 3 Prop-content-length: 102 Content-length: 102 -K 7 -svn:log -V 2 -cp K 10 svn:author V 6 @@ -328,6 +324,10 @@ K 8 svn:date V 27 2010-07-08T21:25:07.187500Z +K 7 +svn:log +V 2 +cp PROPS-END Node-path: trunk/H Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 64feac049b5 Prop-content-sha1: (svn:date) a5f1b6bfa3ba00c58a7cfda966715513d6c050d2 Content-length: 133 -K 7 -svn:log -V 32 -Import the Greek Tree to /trunk. K 10 svn:author V 6 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2008-06-14T09:28:38.718750Z +K 7 +svn:log +V 32 +Import the Greek Tree to /trunk. PROPS-END Node-path: trunk @@ -57,10 +57,6 @@ Prop-content-md5: (svn:date) f011aa8030d Prop-content-sha1: (svn:date) 8b2d68b4dc77c4255122d6896da1ca7f5bae6d47 Content-length: 105 -K 7 -svn:log -V 5 -add X K 10 svn:author V 6 @@ -69,6 +65,10 @@ K 8 svn:date V 27 2010-07-08T21:22:47.484375Z +K 7 +svn:log +V 5 +add X PROPS-END Revision-number: 3 @@ -81,10 +81,6 @@ Prop-content-md5: (svn:date) 7d66d31133b Prop-content-sha1: (svn:date) d6fbd0558bcc220eea1d794975114a75c69703e8 Content-length: 102 -K 7 -svn:log -V 2 -cp K 10 svn:author V 6 @@ -93,6 +89,10 @@ K 8 svn:date V 27 2010-07-08T21:25:07.187500Z +K 7 +svn:log +V 2 +cp PROPS-END Node-path: trunk/H Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump Wed Jul 21 23:06:26 2010 @@ -24,11 +24,6 @@ Prop-content-md5: (svn:date) a9286b75679 Prop-content-sha1: (svn:date) bf5e60dd41846af4a1938a145e5b2dc72caf7a65 Content-length: 105 -K 7 -svn:log -V 5 -blah - K 10 svn:author V 6 @@ -37,6 +32,11 @@ K 8 svn:date V 27 2005-12-21T23:12:58.931794Z +K 7 +svn:log +V 5 +blah + PROPS-END Node-path: Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 50c9b547542 Prop-content-sha1: (svn:date) d28f750443887b4cf7300a6e1360212ca6c6b971 Content-length: 105 -K 7 -svn:log -V 5 -stuff K 10 svn:author V 6 @@ -36,6 +32,10 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump Wed Jul 21 23:06:26 2010 @@ -24,11 +24,6 @@ Prop-content-md5: (svn:date) 6ec8580a0f6 Prop-content-sha1: (svn:date) d8b503d01cfb7391d0a5ecdf712787cdd6643cd3 Content-length: 114 -K 7 -svn:log -V 13 -Added a file - K 10 svn:author V 6 @@ -37,6 +32,11 @@ 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 @@ -62,10 +62,6 @@ Prop-content-md5: (svn:date) d6010780d9e Prop-content-sha1: (svn:date) 55a882a65d5c697e3fcf4f7abad507fcb7809e5c Content-length: 112 -K 7 -svn:log -V 11 -modified it K 10 svn:author V 6 @@ -74,6 +70,10 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/no-author.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/no-author.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/no-author.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/no-author.dump Wed Jul 21 23:06:26 2010 @@ -22,15 +22,15 @@ Prop-content-md5: (svn:date) 597b5364abc Prop-content-sha1: (svn:date) 21c46980750e710eb3c5a6a14ec3b414226673a5 Content-length: 77 +K 8 +svn:date +V 27 +2006-10-27T18:55:49.840787Z K 7 svn:log V 4 foo -K 8 -svn:date -V 27 -2006-10-27T18:55:49.840787Z PROPS-END Node-path: trunk Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) e5981b20ba4 Prop-content-sha1: (svn:date) 91d0335a2bb3be894e7404845be77ec6204d8b25 Content-length: 104 -K 7 -svn:log -V 4 -wwww K 10 svn:author V 6 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2009-06-29T12:23:55.134926Z +K 7 +svn:log +V 4 +wwww PROPS-END Node-path: full Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/revprops.dump Wed Jul 21 23:06:26 2010 @@ -32,22 +32,22 @@ Prop-content-md5: (svn:date) 65ac64d8cca Prop-content-sha1: (svn:date) e55b50fb4607950d7b8e78092d5771a53bcbdd02 Content-length: 132 -K 7 -svn:log -V 0 - K 10 svn:author V 3 lgo -K 13 -svn:mergeinfo -V 10 -/trunk:1:2 K 8 svn:date V 27 2007-12-07T20:53:40.322712Z +K 7 +svn:log +V 0 + +K 13 +svn:mergeinfo +V 10 +/trunk:1:2 PROPS-END Node-path: test.txt @@ -82,10 +82,6 @@ Prop-content-md5: (svn:date) f3d8837082c Prop-content-sha1: (svn:date) 3d7b7e4383358001a010e8d217cc71099a73ac6e Content-length: 124 -K 7 -svn:log -V 26 -Import greek tree on trunk K 10 svn:author V 3 @@ -94,6 +90,10 @@ K 8 svn:date V 27 2007-12-07T20:56:45.939703Z +K 7 +svn:log +V 26 +Import greek tree on trunk PROPS-END Node-path: trunk/A @@ -334,10 +334,6 @@ Prop-content-md5: (svn:date) 0d8a658946f Prop-content-sha1: (svn:date) 788b71e9b4b5c67b0b2135673e76dfa57079ef68 Content-length: 127 -K 7 -svn:log -V 29 -* trunk/A/D/H/psi: extra line K 10 svn:author V 3 @@ -346,6 +342,10 @@ K 8 svn:date V 27 2007-12-07T21:12:26.232653Z +K 7 +svn:log +V 29 +* trunk/A/D/H/psi: extra line PROPS-END Node-path: trunk/A/D/H/psi Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) e795d61fff7 Prop-content-sha1: (svn:date) 407b1db5001e0710228ffa60858350c04807c9e4 Content-length: 115 -K 7 -svn:log -V 17 -Add base folders. K 10 svn:author V 3 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2008-01-02T20:33:05.279494Z +K 7 +svn:log +V 17 +Add base folders. PROPS-END Node-path: project1 @@ -84,10 +84,6 @@ Prop-content-md5: (svn:date) 5d345ba3cfa Prop-content-sha1: (svn:date) 3540287f0f83c8ca30f88eef5e5e63c25f2739f9 Content-length: 110 -K 7 -svn:log -V 12 -Add folders. K 10 svn:author V 3 @@ -96,6 +92,10 @@ K 8 svn:date V 27 2008-01-02T20:33:06.265712Z +K 7 +svn:log +V 12 +Add folders. PROPS-END Node-path: project1/trunk/A @@ -135,10 +135,6 @@ Prop-content-md5: (svn:date) b1adc5df86c Prop-content-sha1: (svn:date) f22f40deef795db88a82950ee168dfe37ce4944b Content-length: 106 -K 7 -svn:log -V 9 -Add file. K 10 svn:author V 3 @@ -147,6 +143,10 @@ K 8 svn:date V 27 2008-01-02T20:33:07.283685Z +K 7 +svn:log +V 9 +Add file. PROPS-END Node-path: project1/trunk/A/B/C/file.txt @@ -173,10 +173,6 @@ Prop-content-md5: (svn:date) 7c24e8c449e Prop-content-sha1: (svn:date) cb6ae843cf2ba3e8c173223ab7dd0707a734bcaf Content-length: 117 -K 7 -svn:log -V 19 -Add file file2.txt. K 10 svn:author V 3 @@ -185,6 +181,10 @@ K 8 svn:date V 27 2008-01-02T20:33:08.278330Z +K 7 +svn:log +V 19 +Add file file2.txt. PROPS-END Node-path: project1/trunk/A/B/C/file2.txt @@ -211,10 +211,6 @@ Prop-content-md5: (svn:date) ac1adc3a8e8 Prop-content-sha1: (svn:date) 92f8c93d3494b34e3a0daccfe466153f4bc4f665 Content-length: 127 -K 7 -svn:log -V 29 -move project and modify file. K 10 svn:author V 3 @@ -223,6 +219,10 @@ K 8 svn:date V 27 2008-01-02T20:33:12.238116Z +K 7 +svn:log +V 29 +move project and modify file. PROPS-END Node-path: branches @@ -312,10 +312,6 @@ Prop-content-md5: (svn:date) dfda2ba5f85 Prop-content-sha1: (svn:date) f48493f090bb9345229cfea45ae68e39c5831481 Content-length: 115 -K 7 -svn:log -V 17 -removed project1. K 10 svn:author V 3 @@ -324,6 +320,10 @@ K 8 svn:date V 27 2008-01-02T20:33:14.261412Z +K 7 +svn:log +V 17 +removed project1. PROPS-END Node-path: project1 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump Wed Jul 21 23:06:26 2010 @@ -16,10 +16,6 @@ Revision-number: 1 Prop-content-length: 97 Content-length: 97 -K 7 -svn:log -V 0 - K 10 svn:author V 3 @@ -28,6 +24,10 @@ K 8 svn:date V 27 2007-12-07T20:53:40.322712Z +K 7 +svn:log +V 0 + PROPS-END Node-path: test.txt @@ -55,10 +55,6 @@ Revision-number: 2 Prop-content-length: 124 Content-length: 124 -K 7 -svn:log -V 26 -Import greek tree on trunk K 10 svn:author V 3 @@ -67,6 +63,10 @@ K 8 svn:date V 27 2007-12-07T20:56:45.939703Z +K 7 +svn:log +V 26 +Import greek tree on trunk PROPS-END Node-path: trunk/A @@ -289,10 +289,6 @@ Revision-number: 3 Prop-content-length: 127 Content-length: 127 -K 7 -svn:log -V 29 -* trunk/A/D/H/psi: extra line K 10 svn:author V 3 @@ -301,6 +297,10 @@ K 8 svn:date V 27 2007-12-07T21:12:26.232653Z +K 7 +svn:log +V 29 +* trunk/A/D/H/psi: extra line PROPS-END Node-path: trunk/A/D/H/psi @@ -318,10 +318,6 @@ Revision-number: 4 Prop-content-length: 128 Content-length: 128 -K 7 -svn:log -V 26 -make changes on A and iota K 10 svn:author V 7 @@ -330,6 +326,10 @@ K 8 svn:date V 27 2007-12-09T21:25:05.711998Z +K 7 +svn:log +V 26 +make changes on A and iota PROPS-END Node-path: trunk/A @@ -362,10 +362,6 @@ Revision-number: 5 Prop-content-length: 116 Content-length: 116 -K 7 -svn:log -V 14 -Renamed A to B K 10 svn:author V 7 @@ -374,6 +370,10 @@ K 8 svn:date V 27 2007-12-09T21:26:14.639561Z +K 7 +svn:log +V 14 +Renamed A to B PROPS-END Node-path: trunk/B @@ -391,10 +391,6 @@ Revision-number: 6 Prop-content-length: 116 Content-length: 116 -K 7 -svn:log -V 14 -Moved B/D to A K 10 svn:author V 7 @@ -403,6 +399,10 @@ K 8 svn:date V 27 2007-12-09T21:27:02.055549Z +K 7 +svn:log +V 14 +Moved B/D to A PROPS-END Node-path: trunk/A @@ -420,10 +420,6 @@ Revision-number: 7 Prop-content-length: 125 Content-length: 125 -K 7 -svn:log -V 23 -Added property to trunk K 10 svn:author V 7 @@ -432,6 +428,10 @@ K 8 svn:date V 27 2007-12-09T21:28:07.300170Z +K 7 +svn:log +V 23 +Added property to trunk PROPS-END Node-path: trunk Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 65ac64d8cca Prop-content-sha1: (svn:date) e55b50fb4607950d7b8e78092d5771a53bcbdd02 Content-length: 97 -K 7 -svn:log -V 0 - K 10 svn:author V 3 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2007-12-07T20:53:40.322712Z +K 7 +svn:log +V 0 + PROPS-END Node-path: trunk @@ -57,10 +57,6 @@ Prop-content-md5: (svn:date) f3d8837082c Prop-content-sha1: (svn:date) 3d7b7e4383358001a010e8d217cc71099a73ac6e Content-length: 124 -K 7 -svn:log -V 26 -Import greek tree on trunk K 10 svn:author V 3 @@ -69,6 +65,10 @@ K 8 svn:date V 27 2007-12-07T20:56:45.939703Z +K 7 +svn:log +V 26 +Import greek tree on trunk PROPS-END Node-path: trunk/A @@ -296,10 +296,6 @@ Prop-content-md5: (svn:date) 0d8a658946f Prop-content-sha1: (svn:date) 788b71e9b4b5c67b0b2135673e76dfa57079ef68 Content-length: 127 -K 7 -svn:log -V 29 -* trunk/A/D/H/psi: extra line K 10 svn:author V 3 @@ -308,6 +304,10 @@ K 8 svn:date V 27 2007-12-07T21:12:26.232653Z +K 7 +svn:log +V 29 +* trunk/A/D/H/psi: extra line PROPS-END Node-path: trunk/A/D/H/psi @@ -332,10 +332,6 @@ Prop-content-md5: (svn:date) 9fe701bb0e5 Prop-content-sha1: (svn:date) 589370c75026addcdd5c11772aa206bb9a6d389e Content-length: 128 -K 7 -svn:log -V 26 -make changes on A and iota K 10 svn:author V 7 @@ -344,6 +340,10 @@ K 8 svn:date V 27 2007-12-09T21:25:05.711998Z +K 7 +svn:log +V 26 +make changes on A and iota PROPS-END Node-path: trunk/A @@ -371,10 +371,6 @@ Prop-content-md5: (svn:date) ea204d8057e Prop-content-sha1: (svn:date) 3b183cd08efe14a34541311ff10d8df09a448522 Content-length: 116 -K 7 -svn:log -V 14 -Renamed A to B K 10 svn:author V 7 @@ -383,6 +379,10 @@ K 8 svn:date V 27 2007-12-09T21:26:14.639561Z +K 7 +svn:log +V 14 +Renamed A to B PROPS-END Node-path: trunk/A @@ -399,10 +399,6 @@ Prop-content-md5: (svn:date) 008dd7b8ca0 Prop-content-sha1: (svn:date) d7ab15a75694a73885b1707b7d1652bb831ec5e8 Content-length: 116 -K 7 -svn:log -V 14 -Moved B/D to A K 10 svn:author V 7 @@ -411,6 +407,10 @@ K 8 svn:date V 27 2007-12-09T21:27:02.055549Z +K 7 +svn:log +V 14 +Moved B/D to A PROPS-END Node-path: trunk/A @@ -542,10 +542,6 @@ Prop-content-md5: (svn:date) e83ec98db8e Prop-content-sha1: (svn:date) 474deb2c396cec8418307577caa3a7339f17ea2e Content-length: 125 -K 7 -svn:log -V 23 -Added property to trunk K 10 svn:author V 7 @@ -554,6 +550,10 @@ K 8 svn:date V 27 2007-12-09T21:28:07.300170Z +K 7 +svn:log +V 23 +Added property to trunk PROPS-END Node-path: trunk Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump Wed Jul 21 23:06:26 2010 @@ -16,10 +16,6 @@ Revision-number: 1 Prop-content-length: 97 Content-length: 97 -K 7 -svn:log -V 0 - K 10 svn:author V 3 @@ -28,6 +24,10 @@ K 8 svn:date V 27 2007-12-07T20:53:40.322712Z +K 7 +svn:log +V 0 + PROPS-END Node-path: test.txt @@ -55,10 +55,6 @@ Revision-number: 2 Prop-content-length: 124 Content-length: 124 -K 7 -svn:log -V 26 -Import greek tree on trunk K 10 svn:author V 3 @@ -67,6 +63,10 @@ K 8 svn:date V 27 2007-12-07T20:56:45.939703Z +K 7 +svn:log +V 26 +Import greek tree on trunk PROPS-END Node-path: trunk/A @@ -289,10 +289,6 @@ Revision-number: 3 Prop-content-length: 127 Content-length: 127 -K 7 -svn:log -V 29 -* trunk/A/D/H/psi: extra line K 10 svn:author V 3 @@ -301,6 +297,10 @@ K 8 svn:date V 27 2007-12-07T21:12:26.232653Z +K 7 +svn:log +V 29 +* trunk/A/D/H/psi: extra line PROPS-END Node-path: trunk/A/D/H/psi Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 65ac64d8cca Prop-content-sha1: (svn:date) e55b50fb4607950d7b8e78092d5771a53bcbdd02 Content-length: 97 -K 7 -svn:log -V 0 - K 10 svn:author V 3 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2007-12-07T20:53:40.322712Z +K 7 +svn:log +V 0 + PROPS-END Node-path: trunk @@ -57,10 +57,6 @@ Prop-content-md5: (svn:date) f3d8837082c Prop-content-sha1: (svn:date) 3d7b7e4383358001a010e8d217cc71099a73ac6e Content-length: 124 -K 7 -svn:log -V 26 -Import greek tree on trunk K 10 svn:author V 3 @@ -69,6 +65,10 @@ K 8 svn:date V 27 2007-12-07T20:56:45.939703Z +K 7 +svn:log +V 26 +Import greek tree on trunk PROPS-END Node-path: trunk/A @@ -309,10 +309,6 @@ Prop-content-md5: (svn:date) 0d8a658946f Prop-content-sha1: (svn:date) 788b71e9b4b5c67b0b2135673e76dfa57079ef68 Content-length: 127 -K 7 -svn:log -V 29 -* trunk/A/D/H/psi: extra line K 10 svn:author V 3 @@ -321,6 +317,10 @@ K 8 svn:date V 27 2007-12-07T21:12:26.232653Z +K 7 +svn:log +V 29 +* trunk/A/D/H/psi: extra line PROPS-END Node-path: trunk/A/D/H/psi Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 56078dd7c8e Prop-content-sha1: (svn:date) 815da5e8791ae8d419e0c2c83f139a5fe6a3e001 Content-length: 105 -K 7 -svn:log -V 5 -setup K 10 svn:author V 6 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2005-11-04T23:04:15.060966Z +K 7 +svn:log +V 5 +setup PROPS-END Node-path: tags @@ -66,10 +66,6 @@ Prop-content-md5: (svn:date) 862458ae04a Prop-content-sha1: (svn:date) ab480fd6e98659ca9ce03f3eff7213ca303f8f29 Content-length: 106 -K 7 -svn:log -V 6 -tag it K 10 svn:author V 6 @@ -78,6 +74,10 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) d92941fc488 Prop-content-sha1: (svn:date) 8f38fcb744bd1143533f08521db241cb54501bd1 Content-length: 105 -K 7 -svn:log -V 5 -stuff K 10 svn:author V 6 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2005-11-05T00:11:07.194039Z +K 7 +svn:log +V 5 +stuff PROPS-END Node-path: tags @@ -75,10 +75,6 @@ Prop-content-md5: (svn:date) 9c81fd8fde0 Prop-content-sha1: (svn:date) 2d25c8fb2554c0a0560109ad573db6eb26acb582 Content-length: 111 -K 7 -svn:log -V 10 -more stuff K 10 svn:author V 6 @@ -87,6 +83,10 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) ed886aa6996 Prop-content-sha1: (svn:date) 12760e904f72cb239eea36c02488f94a65f5af3a Content-length: 115 -K 7 -svn:log -V 14 -initial layout K 10 svn:author V 6 @@ -36,6 +32,10 @@ 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 @@ -75,10 +75,6 @@ Prop-content-md5: (svn:date) 1850831dfb9 Prop-content-sha1: (svn:date) 768a02028e9b7f7d70422366e9e18391db9aeb78 Content-length: 111 -K 7 -svn:log -V 10 -add a file K 10 svn:author V 6 @@ -87,6 +83,10 @@ 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 @@ -112,11 +112,6 @@ Prop-content-md5: (svn:date) 1872a9c3ebf Prop-content-sha1: (svn:date) 36cf7ac0d23cd15f8e4983192a370d545e293f56 Content-length: 113 -K 7 -svn:log -V 12 -make a tag. - K 10 svn:author V 6 @@ -125,6 +120,11 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) ed886aa6996 Prop-content-sha1: (svn:date) 12760e904f72cb239eea36c02488f94a65f5af3a Content-length: 115 -K 7 -svn:log -V 14 -initial layout K 10 svn:author V 6 @@ -36,6 +32,10 @@ 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 @@ -75,10 +75,6 @@ Prop-content-md5: (svn:date) 1850831dfb9 Prop-content-sha1: (svn:date) 768a02028e9b7f7d70422366e9e18391db9aeb78 Content-length: 111 -K 7 -svn:log -V 10 -add a file K 10 svn:author V 6 @@ -87,6 +83,10 @@ 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 @@ -112,11 +112,6 @@ Prop-content-md5: (svn:date) 1872a9c3ebf Prop-content-sha1: (svn:date) 36cf7ac0d23cd15f8e4983192a370d545e293f56 Content-length: 113 -K 7 -svn:log -V 12 -make a tag. - K 10 svn:author V 6 @@ -125,6 +120,11 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) fdb200dfc19 Prop-content-sha1: (svn:date) d48ff8f98d7d4f4ea09001bebfc587594a42322f Content-length: 115 -K 7 -svn:log -V 14 -initial layout K 10 svn:author V 6 @@ -36,6 +32,10 @@ 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 @@ -75,11 +75,6 @@ Prop-content-md5: (svn:date) ae03b06fa8f Prop-content-sha1: (svn:date) 7caaa073b292e167331993804eb9757885932a5e Content-length: 112 -K 7 -svn:log -V 11 -add a file - K 10 svn:author V 6 @@ -88,6 +83,11 @@ 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 @@ -113,11 +113,6 @@ Prop-content-md5: (svn:date) b8216840858 Prop-content-sha1: (svn:date) a05bfbd3e1370b85fe541ccf1bc0c97540a12188 Content-length: 126 -K 7 -svn:log -V 25 -tag with a modified file - K 10 svn:author V 6 @@ -126,6 +121,11 @@ 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 Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump?rev=966458&r1=966457&r2=966458&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump (original) +++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump Wed Jul 21 23:06:26 2010 @@ -24,10 +24,6 @@ Prop-content-md5: (svn:date) 9094b7f0719 Prop-content-sha1: (svn:date) 3077b24c4f2074ea43fd93de1a1ff175a82bd75a Content-length: 101 -K 7 -svn:log -V 1 -, K 10 svn:author V 6 @@ -36,6 +32,10 @@ K 8 svn:date V 27 2006-10-23T20:26:00.932678Z +K 7 +svn:log +V 1 +, PROPS-END Node-path: foo%20bar.txt @@ -61,10 +61,6 @@ Prop-content-md5: (svn:date) c0017ad6b8c Prop-content-sha1: (svn:date) fd8afd87628eb5d8bb40a089085d63a7a277b907 Content-length: 101 -K 7 -svn:log -V 1 -, K 10 svn:author V 6 @@ -73,6 +69,10 @@ K 8 svn:date V 27 2006-10-23T20:26:12.565554Z +K 7 +svn:log +V 1 +, PROPS-END Node-path: foo bar.txt @@ -98,10 +98,6 @@ Prop-content-md5: (svn:date) f4533e34ea1 Prop-content-sha1: (svn:date) 79f998bc0125cc6fda85a357be6697ee00224215 Content-length: 102 -K 7 -svn:log -V 1 -, K 10 svn:author V 7 @@ -110,6 +106,10 @@ K 8 svn:date V 27 2006-10-23T20:52:11.378819Z +K 7 +svn:log +V 1 +, PROPS-END Node-path: foo%20bar.txt