You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/07/23 21:37:24 UTC
svn commit: r967221 [6/7] - in /subversion/branches/atomic-revprop: ./
build/generator/ notes/ notes/tree-conflicts/
subversion/bindings/javahl/tests/org/apache/subversion/javahl/
subversion/bindings/javahl/tests/org/tigris/subversion/javahl/ subversio...
Modified: subversion/branches/atomic-revprop/subversion/svn/mkdir-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/mkdir-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/mkdir-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/mkdir-cmd.c Fri Jul 23 19:37:19 2010
@@ -47,7 +47,6 @@ svn_cl__mkdir(apr_getopt_t *os,
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_array_header_t *targets;
- svn_commit_info_t *commit_info = NULL;
svn_error_t *err;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
@@ -57,10 +56,6 @@ svn_cl__mkdir(apr_getopt_t *os,
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, pool));
-
if (! svn_path_is_url(APR_ARRAY_IDX(targets, 0, const char *)))
{
ctx->log_msg_func3 = NULL;
@@ -80,7 +75,7 @@ svn_cl__mkdir(apr_getopt_t *os,
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool));
- err = svn_client_mkdir3(&commit_info, targets, opt_state->parents,
+ err = svn_client_mkdir4(targets, opt_state->parents,
opt_state->revprop_table, ctx, pool);
if (ctx->log_msg_func3)
@@ -101,8 +96,5 @@ svn_cl__mkdir(apr_getopt_t *os,
return svn_error_return(err);
}
- if (commit_info && ! opt_state->quiet)
- SVN_ERR(svn_cl__print_commit_info(commit_info, pool));
-
return SVN_NO_ERROR;
}
Modified: subversion/branches/atomic-revprop/subversion/svn/move-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/move-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/move-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/move-cmd.c Fri Jul 23 19:37:19 2010
@@ -48,7 +48,6 @@ svn_cl__move(apr_getopt_t *os,
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_array_header_t *targets;
const char *dst_path;
- svn_commit_info_t *commit_info = NULL;
svn_error_t *err;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
@@ -66,10 +65,6 @@ svn_cl__move(apr_getopt_t *os,
_("Cannot specify revisions (except HEAD) with move operations"));
}
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, pool));
-
dst_path = APR_ARRAY_IDX(targets, targets->nelts - 1, const char *);
apr_array_pop(targets);
@@ -89,7 +84,7 @@ svn_cl__move(apr_getopt_t *os,
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool));
- err = svn_client_move5(&commit_info, targets, dst_path, opt_state->force,
+ err = svn_client_move6(targets, dst_path, opt_state->force,
TRUE, opt_state->parents, opt_state->revprop_table,
ctx, pool);
@@ -101,8 +96,5 @@ svn_cl__move(apr_getopt_t *os,
else if (err)
return svn_error_return(err);
- if (commit_info && ! opt_state->quiet)
- SVN_ERR(svn_cl__print_commit_info(commit_info, pool));
-
return SVN_NO_ERROR;
}
Modified: subversion/branches/atomic-revprop/subversion/svn/patch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/patch-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/patch-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/patch-cmd.c Fri Jul 23 19:37:19 2010
@@ -72,10 +72,6 @@ svn_cl__patch(apr_getopt_t *os,
APR_ARRAY_IDX(targets, 0, const char *),
pool));
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, pool));
-
SVN_ERR(svn_client_patch(abs_patch_path, abs_target_path,
opt_state->dry_run, opt_state->strip_count,
opt_state->reverse_diff,
Modified: subversion/branches/atomic-revprop/subversion/svn/propdel-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/propdel-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/propdel-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/propdel-cmd.c Fri Jul 23 19:37:19 2010
@@ -91,8 +91,8 @@ svn_cl__propdel(apr_getopt_t *os,
if (! opt_state->quiet)
{
- SVN_ERR(svn_cl__get_notifier(&nwb.real_func, &nwb.real_baton, FALSE,
- pool));
+ nwb.real_func = ctx->notify_func2;
+ nwb.real_baton = ctx->notify_baton2;
ctx->notify_func2 = notify_wrapper;
ctx->notify_baton2 = &nwb;
}
@@ -129,15 +129,14 @@ svn_cl__propdel(apr_getopt_t *os,
for (i = 0; i < targets->nelts; i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
- svn_commit_info_t *commit_info;
svn_pool_clear(subpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
/* Pass FALSE for 'skip_checks' because it doesn't matter here,
and opt_state->force doesn't apply to this command anyway. */
- SVN_ERR(svn_cl__try(svn_client_propset3
- (&commit_info, pname_utf8,
+ SVN_ERR(svn_cl__try(svn_client_propset4(
+ pname_utf8,
NULL, target,
opt_state->depth,
FALSE, SVN_INVALID_REVNUM,
Modified: subversion/branches/atomic-revprop/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/propedit-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/propedit-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/propedit-cmd.c Fri Jul 23 19:37:19 2010
@@ -45,6 +45,26 @@
/*** Code. ***/
+struct commit_info_baton
+{
+ const char *pname_utf8;
+ const char *target_local;
+};
+
+static svn_error_t *
+commit_info_handler(const svn_commit_info_t *commit_info,
+ void *baton,
+ apr_pool_t *pool)
+{
+ struct commit_info_baton *cib = baton;
+
+ SVN_ERR(svn_cmdline_printf(pool,
+ _("Set new value for property '%s' on '%s'\n"),
+ cib->pname_utf8, cib->target_local));
+ SVN_ERR(svn_cl__print_commit_info(commit_info, NULL, pool));
+
+ return SVN_NO_ERROR;
+}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
@@ -153,6 +173,7 @@ svn_cl__propedit(apr_getopt_t *os,
else /* operate on a normal, versioned property (not a revprop) */
{
apr_pool_t *subpool = svn_pool_create(pool);
+ struct commit_info_baton cib;
/* The customary implicit dot rule has been prone to user error
* here. For example, Jon Trowbridge <tr...@gnu.og> did
@@ -178,6 +199,8 @@ svn_cl__propedit(apr_getopt_t *os,
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool));
+ cib.pname_utf8 = pname_utf8;
+
/* For each target, edit the property PNAME. */
for (i = 0; i < targets->nelts; i++)
{
@@ -255,11 +278,14 @@ svn_cl__propedit(apr_getopt_t *os,
target_local = svn_path_is_url(target) ? target
: svn_dirent_local_style(target, subpool);
+ cib.target_local = target_local;
+
+ ctx->commit_callback2 = commit_info_handler;
+ ctx->commit_baton = &cib;
/* ...and re-set the property's value accordingly. */
if (edited_propval && !svn_string_compare(propval, edited_propval))
{
- svn_commit_info_t *commit_info = NULL;
svn_error_t *err = SVN_NO_ERROR;
svn_cl__check_boolean_prop_val(pname_utf8, edited_propval->data,
@@ -270,8 +296,7 @@ svn_cl__propedit(apr_getopt_t *os,
opt_state, NULL, ctx->config,
subpool));
- err = svn_client_propset3(&commit_info,
- pname_utf8, edited_propval, target,
+ err = svn_client_propset4(pname_utf8, edited_propval, target,
svn_depth_empty, opt_state->force,
base_rev, NULL, opt_state->revprop_table,
ctx, subpool);
@@ -284,14 +309,10 @@ svn_cl__propedit(apr_getopt_t *os,
/* Print a message if we successfully committed or if it
was just a wc propset (but not if the user aborted an URL
propedit). */
- if (commit_info || ! svn_path_is_url(target))
- SVN_ERR
- (svn_cmdline_printf
- (subpool, _("Set new value for property '%s' on '%s'\n"),
- pname_utf8, target_local));
-
- if (commit_info && ! opt_state->quiet)
- SVN_ERR(svn_cl__print_commit_info(commit_info, subpool));
+ if (!svn_path_is_url(target))
+ SVN_ERR(svn_cmdline_printf(
+ subpool, _("Set new value for property '%s' on '%s'\n"),
+ pname_utf8, target_local));
}
else
{
Modified: subversion/branches/atomic-revprop/subversion/svn/propset-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/propset-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/propset-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/propset-cmd.c Fri Jul 23 19:37:19 2010
@@ -100,10 +100,6 @@ svn_cl__propset(apr_getopt_t *os,
opt_state->targets,
ctx, scratch_pool));
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
/* Implicit "." is okay for revision properties; it just helps
us find the right repository. */
if (opt_state->revprop)
@@ -179,12 +175,11 @@ svn_cl__propset(apr_getopt_t *os,
for (i = 0; i < targets->nelts; i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
- svn_commit_info_t *commit_info;
svn_pool_clear(iterpool);
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
- SVN_ERR(svn_cl__try(svn_client_propset3
- (&commit_info, pname_utf8, propval, target,
+ SVN_ERR(svn_cl__try(svn_client_propset4(
+ pname_utf8, propval, target,
opt_state->depth, opt_state->force,
SVN_INVALID_REVNUM, opt_state->changelists,
NULL, ctx, iterpool),
Modified: subversion/branches/atomic-revprop/subversion/svn/resolve-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/resolve-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/resolve-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/resolve-cmd.c Fri Jul 23 19:37:19 2010
@@ -88,10 +88,6 @@ svn_cl__resolve(apr_getopt_t *os,
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_empty;
Modified: subversion/branches/atomic-revprop/subversion/svn/resolved-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/resolved-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/resolved-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/resolved-cmd.c Fri Jul 23 19:37:19 2010
@@ -59,10 +59,6 @@ svn_cl__resolved(apr_getopt_t *os,
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_empty;
Modified: subversion/branches/atomic-revprop/subversion/svn/revert-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/revert-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/revert-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/revert-cmd.c Fri Jul 23 19:37:19 2010
@@ -56,10 +56,6 @@ svn_cl__revert(apr_getopt_t *os,
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
/* Revert is especially conservative, by default it is as
nonrecursive as possible. */
if (opt_state->depth == svn_depth_unknown)
Modified: subversion/branches/atomic-revprop/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/status-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/status-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/status-cmd.c Fri Jul 23 19:37:19 2010
@@ -262,11 +262,6 @@ svn_cl__status(apr_getopt_t *os,
/* We want our -u statuses to be against HEAD. */
rev.kind = svn_opt_revision_head;
- /* The notification callback, leave the notifier as NULL in XML mode */
- if (! opt_state->xml)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
sb.had_print_error = FALSE;
if (opt_state->xml)
Modified: subversion/branches/atomic-revprop/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/switch-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/switch-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/switch-cmd.c Fri Jul 23 19:37:19 2010
@@ -145,10 +145,6 @@ svn_cl__switch(apr_getopt_t *os,
/* Canonicalize the URL. */
switch_url = svn_uri_canonicalize(switch_url, scratch_pool);
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
/* Deal with depthstuffs. */
if (opt_state->set_depth != svn_depth_unknown)
{
Modified: subversion/branches/atomic-revprop/subversion/svn/unlock-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/unlock-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/unlock-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/unlock-cmd.c Fri Jul 23 19:37:19 2010
@@ -57,9 +57,6 @@ svn_cl__unlock(apr_getopt_t *os,
if (! targets->nelts)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
- scratch_pool));
-
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
return svn_error_return(
Modified: subversion/branches/atomic-revprop/subversion/svn/update-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/update-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/update-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/update-cmd.c Fri Jul 23 19:37:19 2010
@@ -73,10 +73,6 @@ svn_cl__update(apr_getopt_t *os,
scratch_pool));
}
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
/* Deal with depthstuffs. */
if (opt_state->set_depth != svn_depth_unknown)
{
Modified: subversion/branches/atomic-revprop/subversion/svn/upgrade-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/upgrade-cmd.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/upgrade-cmd.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/upgrade-cmd.c Fri Jul 23 19:37:19 2010
@@ -57,10 +57,6 @@ svn_cl__upgrade(apr_getopt_t *os,
/* Add "." if user passed 0 arguments */
svn_opt_push_implicit_dot_target(targets, scratch_pool);
- if (! opt_state->quiet)
- SVN_ERR(svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
- FALSE, scratch_pool));
-
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, scratch_pool));
iterpool = svn_pool_create(scratch_pool);
Modified: subversion/branches/atomic-revprop/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/svn/util.c?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/svn/util.c (original)
+++ subversion/branches/atomic-revprop/subversion/svn/util.c Fri Jul 23 19:37:19 2010
@@ -66,7 +66,8 @@
svn_error_t *
-svn_cl__print_commit_info(svn_commit_info_t *commit_info,
+svn_cl__print_commit_info(const svn_commit_info_t *commit_info,
+ void *baton,
apr_pool_t *pool)
{
if (SVN_IS_VALID_REVNUM(commit_info->revision))
Propchange: subversion/branches/atomic-revprop/subversion/svnrdump/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 23 19:37:19 2010
@@ -0,0 +1,7 @@
+svnrdump
+svnrdump.exe
+.libs
+*.o
+*.lo
+*~
+.*~
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/basic_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/basic_tests.py Fri Jul 23 19:37:19 2010
@@ -704,8 +704,11 @@ def basic_cleanup(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_output)
- # corrupted/non-existing temporary directory should be restored
- svntest.actions.remove_admin_tmp_dir(B_path)
+ # corrupted/non-existing temporary directory should be restored while
+ # we are not at single-db (where this tmp dir will be gone)
+ tmp_path = os.path.join(B_path, svntest.main.get_admin_name(), 'tmp')
+ if os.path.exists(tmp_path):
+ svntest.main.safe_rmtree(tmp_path)
# Run cleanup (### todo: cleanup doesn't currently print anything)
svntest.actions.run_and_verify_svn("Cleanup command", None, [],
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/checkout_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/checkout_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/checkout_tests.py Fri Jul 23 19:37:19 2010
@@ -151,13 +151,88 @@ def make_local_tree(sbox, mod_files=Fals
#----------------------------------------------------------------------
def checkout_with_obstructions(sbox):
- """co with obstructions should fail without --force"""
+ """co with obstructions conflicts without --force"""
make_local_tree(sbox, False, False)
- svntest.actions.run_and_verify_svn("No error where some expected",
- None, svntest.verify.AnyOutput,
- "co", sbox.repo_url, sbox.wc_dir)
+ #svntest.factory.make(sbox,
+ # """# Checkout with unversioned obstructions lying around.
+ # svn co url wc_dir
+ # svn status""")
+ #svntest.factory.make(sbox,
+ # """# Now see to it that we can recover from the obstructions.
+ # rm -rf A iota
+ # svn up""")
+ #exit(0)
+
+ wc_dir = sbox.wc_dir
+ url = sbox.repo_url
+
+ # Checkout with unversioned obstructions causes tree conflicts.
+ # svn co url wc_dir
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota' : Item(status=' ', treeconflict='C'),
+ 'A' : Item(status=' ', treeconflict='C'),
+ })
+
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.remove('A/B', 'A/B/E', 'A/B/E/beta', 'A/B/E/alpha', 'A/B/F',
+ 'A/B/lambda', 'A/D', 'A/D/G', 'A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
+ 'A/D/H', 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi', 'A/D/gamma', 'A/C')
+
+ actions.run_and_verify_checkout2(False, url, wc_dir, expected_output,
+ expected_disk, None, None, None, None)
+
+ # svn status
+ expected_status = actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A', 'iota', status='? ', wc_rev=None,
+ treeconflict='C')
+ expected_status.tweak('A/D', 'A/D/G', 'A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
+ 'A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi', 'A/D/gamma', 'A/B',
+ 'A/B/E', 'A/B/E/beta', 'A/B/E/alpha', 'A/B/F', 'A/B/lambda', 'A/C',
+ wc_rev=None)
+ expected_status.tweak('A/mu', status='? ', wc_rev=None)
+
+ actions.run_and_verify_unquiet_status(wc_dir, expected_status)
+
+
+ # Now see to it that we can recover from the obstructions.
+ # rm -rf A iota
+ svntest.main.safe_rmtree( os.path.join(wc_dir, 'A') )
+ os.remove( os.path.join(wc_dir, 'iota') )
+
+ # svn up
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A' : Item(status='A '),
+ 'A/D' : Item(status='A '),
+ 'A/D/gamma' : Item(status='A '),
+ 'A/D/G' : Item(status='A '),
+ 'A/D/G/rho' : Item(status='A '),
+ 'A/D/G/pi' : Item(status='A '),
+ 'A/D/G/tau' : Item(status='A '),
+ 'A/D/H' : Item(status='A '),
+ 'A/D/H/chi' : Item(status='A '),
+ 'A/D/H/omega' : Item(status='A '),
+ 'A/D/H/psi' : Item(status='A '),
+ 'A/B' : Item(status='A '),
+ 'A/B/E' : Item(status='A '),
+ 'A/B/E/beta' : Item(status='A '),
+ 'A/B/E/alpha' : Item(status='A '),
+ 'A/B/F' : Item(status='A '),
+ 'A/B/lambda' : Item(status='A '),
+ 'A/C' : Item(status='A '),
+ 'A/mu' : Item(status='A '),
+ 'iota' : Item(status='A '),
+ })
+
+ expected_disk = svntest.main.greek_state.copy()
+
+ expected_status = actions.get_virginal_state(wc_dir, 1)
+
+ actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
+ expected_status, None, None, None, None, None, False, wc_dir)
+
+
#----------------------------------------------------------------------
@@ -209,23 +284,83 @@ def forced_checkout_of_file_with_dir_obs
#----------------------------------------------------------------------
def forced_checkout_of_dir_with_file_obstructions(sbox):
- """forced co fails if a file obstructs a dir"""
+ """forced co flags conflict if a file obstructs a dir"""
make_local_tree(sbox, False, False)
- # Make the "other" working copy
- other_wc = sbox.add_wc_path('other')
- os.mkdir(other_wc)
- svntest.main.file_append(os.path.join(other_wc, "A"), "The file A")
+ #svntest.factory.make(sbox,"""
+ # mkdir wc_dir_other
+ # echo "The file A" > wc_dir_other/A
+ # svn co --force url wc_dir_other
+ # """)
+ #svntest.factory.make(sbox,"""
+ # # Now see to it that we can recover from the obstructions.
+ # rm wc_dir_other/A
+ # svn up wc_dir_other""")
+ #exit(0)
- # Checkout the standard greek repos into a directory that has a file named
- # "A" obstructing the dir "A" in the repos. This should fail.
- exit_code, sout, serr = svntest.actions.run_and_verify_svn(
- "Expected error during co", None, svntest.verify.AnyOutput,
- "co", "--force", sbox.repo_url, other_wc)
+ url = sbox.repo_url
+ wc_dir_other = sbox.add_wc_path('other')
+
+ other_A = os.path.join(wc_dir_other, 'A')
+
+ # mkdir wc_dir_other
+ os.makedirs(wc_dir_other)
+
+ # echo "The file A" > wc_dir_other/A
+ svntest.main.file_write(other_A, 'The file A\n')
+
+ # svn co --force url wc_dir_other
+ expected_output = svntest.wc.State(wc_dir_other, {
+ 'iota' : Item(status='A '),
+ 'A' : Item(status=' ', treeconflict='C'),
+ })
+
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.remove('A/B', 'A/B/E', 'A/B/E/beta', 'A/B/E/alpha', 'A/B/F',
+ 'A/B/lambda', 'A/D', 'A/D/G', 'A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',
+ 'A/D/H', 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi', 'A/D/gamma', 'A/mu',
+ 'A/C')
+ expected_disk.tweak('A', contents='The file A\n')
+
+ actions.run_and_verify_checkout(url, wc_dir_other, expected_output,
+ expected_disk, None, None, None, None, '--force')
+
+
+ # Now see to it that we can recover from the obstructions.
+ # rm wc_dir_other/A
+ os.remove(other_A)
+
+ # svn up wc_dir_other
+ expected_output = svntest.wc.State(wc_dir_other, {
+ 'A' : Item(status='A '),
+ 'A/mu' : Item(status='A '),
+ 'A/D' : Item(status='A '),
+ 'A/D/G' : Item(status='A '),
+ 'A/D/G/tau' : Item(status='A '),
+ 'A/D/G/pi' : Item(status='A '),
+ 'A/D/G/rho' : Item(status='A '),
+ 'A/D/H' : Item(status='A '),
+ 'A/D/H/psi' : Item(status='A '),
+ 'A/D/H/omega' : Item(status='A '),
+ 'A/D/H/chi' : Item(status='A '),
+ 'A/D/gamma' : Item(status='A '),
+ 'A/C' : Item(status='A '),
+ 'A/B' : Item(status='A '),
+ 'A/B/E' : Item(status='A '),
+ 'A/B/E/beta' : Item(status='A '),
+ 'A/B/E/alpha' : Item(status='A '),
+ 'A/B/F' : Item(status='A '),
+ 'A/B/lambda' : Item(status='A '),
+ })
+
+ expected_disk = svntest.main.greek_state.copy()
+
+ expected_status = actions.get_virginal_state(wc_dir_other, 1)
+
+ actions.run_and_verify_update(wc_dir_other, expected_output, expected_disk,
+ expected_status, None, None, None, None, None, False, wc_dir_other)
- test_stderr(".*Failed to add directory.*a non-directory object of the " \
- "same name already exists", serr)
#----------------------------------------------------------------------
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/commit_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/commit_tests.py Fri Jul 23 19:37:19 2010
@@ -1497,8 +1497,10 @@ def commit_multiple_wc_multiple_repos(sb
# Commit should fail, since WCs come from different repositories.
# The exact error message depends on whether or not the tests are
- # run below a 1.7 working copy
- error_re = ".*(is not a|Are all targets part of the same) working copy.*"
+ # run below an existing working copy
+ error_re = ( ".*(is not a working copy" +
+ "|Are all targets part of the same working copy" +
+ "|was not found).*" )
svntest.actions.run_and_verify_svn("Expected output on stderr doesn't match",
[], error_re,
'commit', '-m', 'log',
@@ -2659,15 +2661,16 @@ def start_commit_detect_capabilities(sbo
def commit_url(sbox):
"'svn commit SOME_URL' should error"
sbox.build()
- wc_dir = sbox.wc_dir
- repos_url = sbox.repo_url
+ url = sbox.repo_url
# Commit directly to a URL
+ expected_error = ("svn: '" + url +
+ "' is a URL, but URLs cannot be commit targets")
svntest.actions.run_and_verify_commit(None,
None,
None,
- "Must give local path",
- repos_url)
+ expected_error,
+ url)
# Test for issue #3198
def commit_added_missing(sbox):
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/export_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/export_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/export_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/export_tests.py Fri Jul 23 19:37:19 2010
@@ -483,6 +483,34 @@ def export_working_copy_ignoring_keyword
expected_disk,
"--ignore-keywords")
+# This is test for issue #3683 - 'Escape unsafe charaters in a URL during
+# export'
+def export_with_url_unsafe_characters(sbox):
+ "export file with URL unsafe characters"
+
+ ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3683 ##
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Define the paths
+ url_unsafe_path = os.path.join(wc_dir, 'A', 'test- @#$&.txt')
+ url_unsafe_path_url = sbox.repo_url + '/A/test- @#$&.txt@'
+ export_target = os.path.join(wc_dir, 'test- @#$&.txt')
+
+ # Create the file with special name and commit it.
+ svntest.main.file_write(url_unsafe_path, 'This is URL unsafe path file.')
+ svntest.main.run_svn(None, 'add', url_unsafe_path + '@')
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m', 'log msg',
+ '--quiet', wc_dir)
+
+ # Export the file and verify it.
+ svntest.actions.run_and_verify_svn(None, None, [], 'export',
+ url_unsafe_path_url, export_target + '@')
+
+ if not os.path.exists(export_target):
+ raise svntest.Failure("export did not fetch file with URL unsafe path")
+
########################################################################
# Run the tests
@@ -509,6 +537,7 @@ test_list = [ None,
export_to_explicit_cwd,
export_ignoring_keyword_translation,
export_working_copy_ignoring_keyword_translation,
+ export_with_url_unsafe_characters,
]
if __name__ == '__main__':
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Fri Jul 23 19:37:19 2010
@@ -1,12 +1,15 @@
-log: Show the log messages for a set of revision(s) and/or file(s).
-usage: 1. log [PATH]
+log: Show the log messages for a set of revision(s) and/or path(s).
+usage: 1. log [PATH][@REV]
2. log URL[@REV] [PATH...]
- 1. Print the log messages for a local PATH (default: '.').
- The default revision range is BASE:1.
+ 1. Print the log messages for the URL corresponding to PATH
+ (default: '.'). If specified, REV is the revision in which the
+ URL is first looked up, and the default revision range is REV:1.
+ If REV is not specified, the default revision range is BASE:1,
+ since the URL might not exist in the HEAD revision.
2. Print the log messages for the PATHs (default: '.') under URL.
- If specified, REV determines in which revision the URL is first
+ If specified, REV is the revision in which the URL is first
looked up, and the default revision range is REV:1; otherwise,
the URL is looked up in HEAD, and the default revision range is
HEAD:1.
@@ -27,8 +30,10 @@ usage: 1. log [PATH]
Examples:
svn log
svn log foo.c
+ svn log bar.c@42
svn log http://www.example.com/repo/project/foo.c
svn log http://www.example.com/repo/project foo.c bar.c
+ svn log http://www.example.com/repo/project@50 foo.c bar.c
Valid options:
-r [--revision] ARG : ARG (some commands also take ARG1:ARG2 range)
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/merge_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/merge_tests.py Fri Jul 23 19:37:19 2010
@@ -15621,6 +15621,131 @@ def record_only_merge_creates_self_refer
None, None, None, None, None, 1, 1,
'--record-only')
+#----------------------------------------------------------------------
+# Test for issue #3657 'phantom svn:eol-style changes cause spurious merge
+# text conflicts'.
+def copy_causes_phantom_eol_conflict(sbox):
+ "other prop changes cause phantom eol conflict"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Some paths we'll care about
+ mu_path = os.path.join(wc_dir, "A", "mu")
+ A_path = os.path.join(wc_dir, "A")
+ A_branch_path = os.path.join(wc_dir, "A-branch")
+ A_branch_backport_path = os.path.join(wc_dir, "A-branch-backport")
+ mu_path = os.path.join(wc_dir, "A", "mu")
+ mu2_path = os.path.join(wc_dir, "A", "mu2")
+ mu_backport_path = os.path.join(wc_dir, "A-branch-backport", "mu")
+
+ # r2 - Set the 'native' svn:eol-style on A/mu:
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ps', 'svn:eol-style', 'native',
+ mu_path)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ci', '-m', 'Set native eol-style',
+ wc_dir)
+
+ # r3 - Branch 'A' to 'A-branch':
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'copy', A_path, A_branch_path)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ci', '-m', 'Create a branch of A',
+ wc_dir)
+
+ # r4 - Make a text mod and prop mod to 'A/mu':
+ svntest.main.file_write(mu_path, "The new mu!\n")
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ps', 'prop-name', 'prop-val', mu_path)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ci', '-m', 'Edit a file', wc_dir)
+
+ # Now merge r4 from 'A' to 'A-branch'.
+ #
+ # Previously this failed over ra_neon and ra_serf on Windows:
+ #
+ # >svn merge ^^/A A-branch -c4
+ # Conflict discovered in 'A-branch/mu'.
+ # Select: (p) postpone, (df) diff-full, (e) edit,
+ # (mc) mine-conflict, (tc) theirs-conflict,
+ # (s) show all options: p
+ # --- Merging r4 into 'A-branch':
+ # CU A-branch\mu
+ # --- Recording mergeinfo for merge of r4 into 'A-branch':
+ # U A-branch
+ # Summary of conflicts:
+ # Text conflicts: 1
+ #
+ # The conflict was on the whole file as it appeared there was an eol-style
+ # change to native, when in fact no such change was present in r7.
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ expected_output = wc.State(A_branch_path, {
+ 'mu' : Item(status='UU'),
+ })
+ expected_mergeinfo_output = wc.State(A_branch_path, {
+ '' : Item(status=' U'),
+ })
+ expected_elision_output = wc.State(A_branch_path, {})
+ expected_status = wc.State(A_branch_path, {
+ '' : Item(status=' M'),
+ 'B' : Item(status=' '),
+ 'mu' : Item(status='MM'),
+ 'B/E' : Item(status=' '),
+ 'B/E/alpha' : Item(status=' '),
+ 'B/E/beta' : Item(status=' '),
+ 'B/lambda' : Item(status=' '),
+ 'B/F' : Item(status=' '),
+ 'C' : Item(status=' '),
+ 'D' : Item(status=' '),
+ 'D/G' : Item(status=' '),
+ 'D/G/pi' : Item(status=' '),
+ 'D/G/rho' : Item(status=' '),
+ 'D/G/tau' : Item(status=' '),
+ 'D/gamma' : Item(status=' '),
+ 'D/H' : Item(status=' '),
+ 'D/H/chi' : Item(status=' '),
+ 'D/H/psi' : Item(status=' '),
+ 'D/H/omega' : Item(status=' '),
+ })
+ expected_status.tweak(wc_rev=4)
+ expected_disk = wc.State('', {
+ '' : Item(props={SVN_PROP_MERGEINFO :
+ '/A:4'}),
+ 'B' : Item(),
+ 'mu' : Item("The new mu!\n",
+ props={'prop-name' : 'prop-val',
+ 'svn:eol-style' : 'native'}),
+ 'B/E' : Item(),
+ 'B/E/alpha' : Item("This is the file 'alpha'.\n"),
+ 'B/E/beta' : Item("This is the file 'beta'.\n"),
+ 'B/lambda' : Item("This is the file 'lambda'.\n"),
+ 'B/F' : Item(),
+ 'C' : Item(),
+ 'D' : Item(),
+ 'D/G' : Item(),
+ 'D/G/pi' : Item("This is the file 'pi'.\n"),
+ 'D/G/rho' : Item("This is the file 'rho'.\n"),
+ 'D/G/tau' : Item("This is the file 'tau'.\n"),
+ 'D/gamma' : Item("This is the file 'gamma'.\n"),
+ 'D/H' : Item(),
+ 'D/H/chi' : Item("This is the file 'chi'.\n"),
+ 'D/H/psi' : Item("This is the file 'psi'.\n"),
+ 'D/H/omega' : Item("This is the file 'omega'.\n"),
+ })
+ expected_skip = wc.State(A_branch_path, {})
+ svntest.actions.run_and_verify_merge(A_branch_path, 3, 4,
+ sbox.repo_url + '/A',
+ None,
+ expected_output,
+ expected_mergeinfo_output,
+ expected_elision_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, None, None, None, None, 1, 1)
+
########################################################################
# Run the tests
@@ -15807,6 +15932,7 @@ test_list = [ None,
foreign_repos_del_and_props,
immediate_depth_merge_creates_minimal_subtree_mergeinfo,
record_only_merge_creates_self_referential_mergeinfo,
+ copy_causes_phantom_eol_conflict,
]
if __name__ == '__main__':
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/schedule_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/schedule_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/schedule_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/schedule_tests.py Fri Jul 23 19:37:19 2010
@@ -713,7 +713,7 @@ test_list = [ None,
add_recursive_already_versioned,
fail_add_directory,
delete_non_existent,
- XFail(delete_redelete_fudgery),
+ delete_redelete_fudgery,
propset_on_deleted_should_fail,
]
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests.py?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests.py Fri Jul 23 19:37:19 2010
@@ -793,8 +793,8 @@ test_list = [ None,
modified_in_place,
tag_empty_trunk,
tag_trunk_with_dir,
- tag_trunk_with_file2,
tag_trunk_with_file,
+ tag_trunk_with_file2,
tag_with_modified_file,
dir_prop_change,
file_dir_file,
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 6ad9f820-0205-0410-94a2-c8cf366bb2
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 1149e75a1dc9b23c9138242a2e7d255f
+Prop-content-sha1: (svn:date) 51b023ca17e273bb79c1b6921d6180099dfa96d0
Content-length: 56
K 8
@@ -14,12 +16,14 @@ 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 7
-svn:log
-V 11
-add foo.txt
K 10
svn:author
V 6
@@ -28,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
@@ -44,13 +52,14 @@ PROPS-END
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 7
-svn:log
-V 34
-copy and change at the same time.
-
K 10
svn:author
V 6
@@ -59,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump Fri Jul 23 19:37:19 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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 0e893bae-2d4c-452c-8616-b774d5b910
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 73ccd9590efcdc0aeb606b49472858fe
+Prop-content-sha1: (svn:date) d146dbd8885d0e01126b0a779130bcac498debf6
Content-length: 56
K 8
@@ -14,14 +16,14 @@ PROPS-END
Revision-number: 1
Prop-content-length: 150
+Prop-content-md5: (svn:log) d3b135229c6d09529e7e635479ab346e
+Prop-content-sha1: (svn:log) 0c0eb26fce72417dee125f93b85a627d3e63b273
+Prop-content-md5: (svn:author) 9dd4c0f7c00a505a9bce62f9ee5096d4
+Prop-content-sha1: (svn:author) 1714ef8b18515a185c9e33512946961b437df4d1
+Prop-content-md5: (svn:date) dc15c87f7ae25d0af3c4a1d414062c93
+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
@@ -30,12 +32,20 @@ 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:
Node-kind: dir
Node-action: change
Prop-content-length: 54
+Prop-content-md5: (svn:ignore) a1b3616b50119b5687b2153eaf3c2671
+Prop-content-sha1: (svn:ignore) c2f8e23b4b55368a8ff3f8306076c59366d312d8
Content-length: 54
K 10
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 5bd4ad05-a105-0410-b7b7-c014cebbdc
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) fd4090f2960efcdf6abf5454fd05cf61
+Prop-content-sha1: (svn:date) 5acb4fce316e7bcf08732f17f2110f37d5280e46
Content-length: 56
K 8
@@ -14,12 +16,14 @@ 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 7
-svn:log
-V 3
-ttb
K 10
svn:author
V 6
@@ -28,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
@@ -59,13 +67,14 @@ 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 7
-svn:log
-V 15
-first version!
-
K 10
svn:author
V 6
@@ -74,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
@@ -91,13 +105,14 @@ 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 7
-svn:log
-V 16
-second version!
-
K 10
svn:author
V 6
@@ -106,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
@@ -121,13 +141,14 @@ 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 7
-svn:log
-V 21
-a copy, but modified
-
K 10
svn:author
V 6
@@ -136,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: c542f1c4-a005-0410-b9aa-b3fbdc38f8
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 71c1690393b5a56e01e7a2b7c908a780
+Prop-content-sha1: (svn:date) 694de0c9c45d5e19b17955cc997d09e4da39c7a7
Content-length: 56
K 8
@@ -14,13 +16,14 @@ 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 7
-svn:log
-V 4
-ttb
-
K 10
svn:author
V 6
@@ -29,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
@@ -60,13 +68,14 @@ 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 7
-svn:log
-V 18
-Add first version
-
K 10
svn:author
V 6
@@ -75,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
@@ -92,13 +106,14 @@ 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 7
-svn:log
-V 19
-Add second version
-
K 10
svn:author
V 6
@@ -107,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
@@ -122,13 +142,14 @@ 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 7
-svn:log
-V 48
-Add a new file to create an uninvolved revision
-
K 10
svn:author
V 6
@@ -137,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
@@ -153,13 +179,14 @@ PROPS-END
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 7
-svn:log
-V 30
-copy from a previous revision
-
K 10
svn:author
V 6
@@ -168,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 265b4915-c811-0410-a32e-b5d713837d
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 9f53196b42e188e442bc8eb52a1d9d74
+Prop-content-sha1: (svn:date) 9a79567c8ea6602419906c884375b991192809a4
Content-length: 56
K 8
@@ -14,12 +16,14 @@ 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 7
-svn:log
-V 16
-add dir and file
K 10
svn:author
V 2
@@ -28,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
@@ -53,12 +61,14 @@ PROPS-END
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 7
-svn:log
-V 29
-copy dir and modify prop of f
K 10
svn:author
V 2
@@ -67,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
@@ -80,6 +94,8 @@ Node-path: dir2/f
Node-kind: file
Node-action: change
Prop-content-length: 27
+Prop-content-md5: (prop) 3a6d0284e743dc4a9b86f97d6dd1a3bf
+Prop-content-sha1: (prop) 39f69c278f46165447f30d10acf54277aaa3d5fc
Content-length: 27
K 4
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 776dcb32-51dc-11de-996d-d717ce91f8
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 41c4565f8ca9970f03a0b2974354f2b3
+Prop-content-sha1: (svn:date) 8797ac4c64d110b528c8b1d8e5196d5a02aa4a3f
Content-length: 56
K 8
@@ -14,12 +16,14 @@ PROPS-END
Revision-number: 1
Prop-content-length: 137
+Prop-content-md5: (svn:log) ae0d83ed222603c668159331b23ca53f
+Prop-content-sha1: (svn:log) e10cb48a2f911944a84f662cada6d6bdf5ab27c4
+Prop-content-md5: (svn:author) 4f3bf0db0166b782272f523c85369931
+Prop-content-sha1: (svn:author) 80a1a5ba52100c840c2eea1c417ca133b55e0d8c
+Prop-content-md5: (svn:date) d3eb2d2ffe43557d43f01f99dd23d7ee
+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
@@ -28,12 +32,18 @@ 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
Node-kind: file
Node-action: add
Prop-content-length: 36
+Prop-content-md5: (svn:eol-style) 618441d41cce47dbcfd9bed6e5ff64e6
+Prop-content-sha1: (svn:eol-style) 91a07087a57580c557f3a426586f0c2f60ef2af4
Text-content-length: 13
Text-content-md5: 65cea5e7a1cc0516de76d7f523f105e6
Text-content-sha1: ecc6621aa15c7c96d81bb9931b33f0c12c93a1c5
@@ -49,12 +59,14 @@ file-content
Revision-number: 2
Prop-content-length: 139
+Prop-content-md5: (svn:log) a6bf066b92960e6bb07b2124a9e5730d
+Prop-content-sha1: (svn:log) 9a012ac49dfef81dcbfbef9567f445af0b132022
+Prop-content-md5: (svn:author) 4f3bf0db0166b782272f523c85369931
+Prop-content-sha1: (svn:author) 80a1a5ba52100c840c2eea1c417ca133b55e0d8c
+Prop-content-md5: (svn:date) 11acbf8a3cae675137de95c1232e1783
+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
@@ -63,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump Fri Jul 23 19:37:19 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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: b105e986-03ce-ba4b-b01a-b7a10dd0b7
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 840bd8724067d9034fdc10b5509c38f9
+Prop-content-sha1: (svn:date) 4a8052a22219238cfb5c079e68e9298cd8b685d8
Content-length: 56
K 8
@@ -14,12 +16,14 @@ PROPS-END
Revision-number: 1
Prop-content-length: 133
+Prop-content-md5: (svn:log) c5173d4c9ada1a8e4e97af037067e1ee
+Prop-content-sha1: (svn:log) 79063f24740970c02830fe48a971969ee58fe587
+Prop-content-md5: (svn:author) 262031397020fd8df478ec13b4b096c5
+Prop-content-sha1: (svn:author) 7b37259e149636e3330d530cbf408f2b8c1eda6a
+Prop-content-md5: (svn:date) 64feac049b514242c014f71ac27bb68b
+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
@@ -28,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
@@ -41,12 +49,14 @@ PROPS-END
Revision-number: 2
Prop-content-length: 105
+Prop-content-md5: (svn:log) e63b7fa9fe1cb870c2f5bb12a1bc5d57
+Prop-content-sha1: (svn:log) 3adaf62e0ceb7f46a9e7336e2c587305b3369586
+Prop-content-md5: (svn:author) 262031397020fd8df478ec13b4b096c5
+Prop-content-sha1: (svn:author) 7b37259e149636e3330d530cbf408f2b8c1eda6a
+Prop-content-md5: (svn:date) f011aa8030d9689b21500e10baeed42b
+Prop-content-sha1: (svn:date) 8b2d68b4dc77c4255122d6896da1ca7f5bae6d47
Content-length: 105
-K 7
-svn:log
-V 5
-add X
K 10
svn:author
V 6
@@ -55,16 +65,22 @@ 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
Prop-content-length: 102
+Prop-content-md5: (svn:log) 9c95319bf274672d6eae7eb97c3dfda5
+Prop-content-sha1: (svn:log) 3f81e91d69a8a61ffbf19297eb0791ad54ce5690
+Prop-content-md5: (svn:author) 262031397020fd8df478ec13b4b096c5
+Prop-content-sha1: (svn:author) 7b37259e149636e3330d530cbf408f2b8c1eda6a
+Prop-content-md5: (svn:date) 7d66d31133b86b67705c69a539842090
+Prop-content-sha1: (svn:date) d6fbd0558bcc220eea1d794975114a75c69703e8
Content-length: 102
-K 7
-svn:log
-V 2
-cp
K 10
svn:author
V 6
@@ -73,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: b760f8ea-7608-0410-b9cc-88a00389c8
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 7741d67d3f97aa1b4c6532187f289027
+Prop-content-sha1: (svn:date) 5853b49cbc8fe34fecbb6978a812723570130ab8
Content-length: 56
K 8
@@ -14,13 +16,14 @@ 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 7
-svn:log
-V 5
-blah
-
K 10
svn:author
V 6
@@ -29,12 +32,19 @@ 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-content-length: 37
+Prop-content-md5: (svn:ignore) 9eb84090956c484e32cb6c08455a667b
+Prop-content-sha1: (svn:ignore) 003d0450f6f7e6db635a04d23245b68e13365463
Content-length: 37
K 10
Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: bd4c07e3-6b11-0410-8af7-f8eca344b6
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) f5dac4babcf6704064f289554907048a
+Prop-content-sha1: (svn:date) bcfed6a359522261d423ef926f94c9c6923e579e
Content-length: 56
K 8
@@ -14,12 +16,14 @@ 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 7
-svn:log
-V 5
-stuff
K 10
svn:author
V 6
@@ -28,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 103a2b4e-2705-0410-8a58-ca61540ba7
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) e88767e42382220d125be1ed367629cc
+Prop-content-sha1: (svn:date) 80df200b991a20c34d6b4e114b2fc2d98137f51a
Content-length: 56
K 8
@@ -14,13 +16,14 @@ 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 7
-svn:log
-V 13
-Added a file
-
K 10
svn:author
V 6
@@ -29,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
@@ -46,12 +54,14 @@ 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 7
-svn:log
-V 11
-modified it
K 10
svn:author
V 6
@@ -60,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/no-author.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/no-author.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/no-author.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/no-author.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 55b1b577-cf20-0410-8f4d-bb83706672
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 42c25a2cbf4ab8d750997c7700f0a4a7
+Prop-content-sha1: (svn:date) 1c533b58c1065325ec970502fa4415476333b940
Content-length: 56
K 8
@@ -14,17 +16,21 @@ PROPS-END
Revision-number: 1
Prop-content-length: 77
+Prop-content-md5: (svn:log) d3b07384d113edec49eaa6238ad5ff00
+Prop-content-sha1: (svn:log) f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+Prop-content-md5: (svn:date) 597b5364abcbac3b321a0162ce3bdd21
+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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 7c1d1c84-647b-4ca5-9d20-057768670f
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) bc143cedbebce0d902d24fb9d2ce804a
+Prop-content-sha1: (svn:date) 5e19fedd13b998c59d39077122eef10689cac166
Content-length: 56
K 8
@@ -14,12 +16,14 @@ PROPS-END
Revision-number: 1
Prop-content-length: 104
+Prop-content-md5: (svn:log) e34a8899ef6468b74f8a1048419ccc8b
+Prop-content-sha1: (svn:log) 573b76b3265bbcfe6a9d2bf0ba54f057f155c921
+Prop-content-md5: (svn:author) 03d2924e0693ecca4b65dd995fdefd38
+Prop-content-sha1: (svn:author) fc0b8cd559ad7a06aa4a0d820aaafd1bef9f52bc
+Prop-content-md5: (svn:date) e5981b20ba4f382a908e2cdcbcb30a41
+Prop-content-sha1: (svn:date) 91d0335a2bb3be894e7404845be77ec6204d8b25
Content-length: 104
-K 7
-svn:log
-V 4
-wwww
K 10
svn:author
V 6
@@ -28,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/revprops.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/revprops.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/revprops.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,10 @@ UUID: 728f5e1e-a57c-4dd4-8b4f-ca752f5178
Revision-number: 0
Prop-content-length: 75
+Prop-content-md5: (foo) cffe6699435a9042ea1d06ddbcd7853a
+Prop-content-sha1: (foo) 1f39e4f188cddd284d64602cba39c580f5ea4335
+Prop-content-md5: (svn:date) 1b69f2412c6c742c9c7244a61fa18e09
+Prop-content-sha1: (svn:date) 566264fef4d43d78fac5966221a636c01cfb8dd8
Content-length: 75
K 3
@@ -18,24 +22,32 @@ PROPS-END
Revision-number: 1
Prop-content-length: 132
+Prop-content-md5: (svn:log) d41d8cd98f00b204e9800998ecf8427e
+Prop-content-sha1: (svn:log) da39a3ee5e6b4b0d3255bfef95601890afd80709
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:mergeinfo) 3b6251fcdc797614cfbc1df34064e3fc
+Prop-content-sha1: (svn:mergeinfo) 545733d85022289004118dd37db90b9df0ffe593
+Prop-content-md5: (svn:date) 65ac64d8cca57d54f7b09789e9e78726
+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
@@ -62,12 +74,14 @@ PROPS-END
Revision-number: 2
Prop-content-length: 124
+Prop-content-md5: (svn:log) c5f0e220fb8ccf25d10ad241dcfd746d
+Prop-content-sha1: (svn:log) ee00102303d31cafd567cb15853e50132446a55c
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) f3d8837082ca5c8c0a62763b33d0837c
+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
@@ -76,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
@@ -308,12 +326,14 @@ This is the file 'iota'.
Revision-number: 3
Prop-content-length: 127
+Prop-content-md5: (svn:log) 5c72cafb682cb5732941ad3b4c35ae59
+Prop-content-sha1: (svn:log) 844692fcd525ed0689e8ee0763a0e4561690b43d
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) 0d8a658946f806a5b815299da6efdfce
+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
@@ -322,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump Fri Jul 23 19:37:19 2010
@@ -4,6 +4,8 @@ UUID: 3f6eb9ce-fbb3-4b51-a522-daa270b3ac
Revision-number: 0
Prop-content-length: 56
+Prop-content-md5: (svn:date) 926c539862b806f66b9c06493676c629
+Prop-content-sha1: (svn:date) 573810eb9df21b2ed82a1131546acea967158b78
Content-length: 56
K 8
@@ -14,12 +16,14 @@ PROPS-END
Revision-number: 1
Prop-content-length: 115
+Prop-content-md5: (svn:log) 4346997c96e47b2f214ae84906a04fd7
+Prop-content-sha1: (svn:log) 02d631ed0cdf29ef714dbd8294fd7da1cc165bcc
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) e795d61fff7f7c25c20803178a00da2b
+Prop-content-sha1: (svn:date) 407b1db5001e0710228ffa60858350c04807c9e4
Content-length: 115
-K 7
-svn:log
-V 17
-Add base folders.
K 10
svn:author
V 3
@@ -28,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
@@ -68,12 +76,14 @@ PROPS-END
Revision-number: 2
Prop-content-length: 110
+Prop-content-md5: (svn:log) 2d1e85cf75aeea63b99f623009eb6a4d
+Prop-content-sha1: (svn:log) d9eb7f5f86729ac03c7e0171bb34663a7e1066bb
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) 5d345ba3cfacd2b6e13864183f3381bf
+Prop-content-sha1: (svn:date) 3540287f0f83c8ca30f88eef5e5e63c25f2739f9
Content-length: 110
-K 7
-svn:log
-V 12
-Add folders.
K 10
svn:author
V 3
@@ -82,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
@@ -113,12 +127,14 @@ PROPS-END
Revision-number: 3
Prop-content-length: 106
+Prop-content-md5: (svn:log) 3505962cba11bb7655d611ab8d0dd5f8
+Prop-content-sha1: (svn:log) 53acc723b0cda36d8dbeaef69fdd04ab04286dab
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) b1adc5df86c72122ceb676d656a13e80
+Prop-content-sha1: (svn:date) f22f40deef795db88a82950ee168dfe37ce4944b
Content-length: 106
-K 7
-svn:log
-V 9
-Add file.
K 10
svn:author
V 3
@@ -127,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
@@ -145,12 +165,14 @@ content for file.txt
Revision-number: 4
Prop-content-length: 117
+Prop-content-md5: (svn:log) 416d5850e22948fb77b09ae08f226c48
+Prop-content-sha1: (svn:log) a238f2952e51a0f67ed790563b0296cc19b4060d
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) 7c24e8c449e29012735cadd320621501
+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
@@ -159,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
@@ -177,12 +203,14 @@ content for file2.txt
Revision-number: 5
Prop-content-length: 127
+Prop-content-md5: (svn:log) dbbba5ba8b0981e95bd3b123e90d188c
+Prop-content-sha1: (svn:log) 4cfa881024df0b37cf93f35e317adf995bcc8aa8
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) ac1adc3a8e8afd515d9f95e8d95093dc
+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
@@ -191,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
@@ -199,6 +231,8 @@ Node-action: add
Node-copyfrom-rev: 4
Node-copyfrom-path: project1/branches
Prop-content-length: 34
+Prop-content-md5: (svn:mergeinfo) d41d8cd98f00b204e9800998ecf8427e
+Prop-content-sha1: (svn:mergeinfo) da39a3ee5e6b4b0d3255bfef95601890afd80709
Content-length: 34
K 13
@@ -226,6 +260,8 @@ Node-action: add
Node-copyfrom-rev: 4
Node-copyfrom-path: project1/tags
Prop-content-length: 34
+Prop-content-md5: (svn:mergeinfo) d41d8cd98f00b204e9800998ecf8427e
+Prop-content-sha1: (svn:mergeinfo) da39a3ee5e6b4b0d3255bfef95601890afd80709
Content-length: 34
K 13
@@ -241,6 +277,8 @@ Node-action: add
Node-copyfrom-rev: 4
Node-copyfrom-path: project1/trunk
Prop-content-length: 34
+Prop-content-md5: (svn:mergeinfo) d41d8cd98f00b204e9800998ecf8427e
+Prop-content-sha1: (svn:mergeinfo) da39a3ee5e6b4b0d3255bfef95601890afd80709
Content-length: 34
K 13
@@ -266,12 +304,14 @@ extra line of test
Revision-number: 6
Prop-content-length: 115
+Prop-content-md5: (svn:log) 2ce727e28e0912e75217378c8b321cf9
+Prop-content-sha1: (svn:log) 5b471ab3caf6219f567c6f25cd941bc8bdd0327c
+Prop-content-md5: (svn:author) e132f7d4c73fdb84ba5f84bcfdcf90b1
+Prop-content-sha1: (svn:author) 037aa8992b1094819e6c95659c91826248822e75
+Prop-content-md5: (svn:date) dfda2ba5f85be4d81643a4f06862f139
+Prop-content-sha1: (svn:date) f48493f090bb9345229cfea45ae68e39c5831481
Content-length: 115
-K 7
-svn:log
-V 17
-removed project1.
K 10
svn:author
V 3
@@ -280,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/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump?rev=967221&r1=967220&r2=967221&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump Fri Jul 23 19:37:19 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