You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/03/10 06:19:04 UTC
svn commit: r1454792 [2/2] - in /subversion/branches/fsfs-format7: ./
subversion/include/ subversion/libsvn_client/ subversion/libsvn_ra_serf/
subversion/libsvn_subr/ subversion/libsvn_wc/ subversion/mod_dav_svn/
subversion/tests/cmdline/ subversion/te...
Modified: subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tests.py?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tests.py Sun Mar 10 05:19:03 2013
@@ -17394,7 +17394,6 @@ def unnecessary_noninheritable_mergeinfo
# svn merge -cr1295005 ^/subversion/trunk@1295000 ../src
# svn merge -cr1295004 ^/subversion/trunk/@r1295004 ../src
@Issue(4132)
-@XFail()
def svnmucc_abuse_1(sbox):
"svnmucc: merge a replacement"
@@ -17429,17 +17428,25 @@ def svnmucc_abuse_1(sbox):
## Attempt to merge that.
# This used to assert:
- # --- Recording mergeinfo for merge of r5 into 'svn-test-work/working_copies/merge_tests-125/A_COPY':
+ # --- Recording mergeinfo for merge of r5 into \
+ # 'svn-test-work/working_copies/merge_tests-125/A_COPY':
# subversion/libsvn_subr/mergeinfo.c:1172: (apr_err=235000)
- # svn: E235000: In file 'subversion/libsvn_subr/mergeinfo.c' line 1172: assertion failed (IS_VALID_FORWARD_RANGE(first))
+ # svn: E235000: In file 'subversion/libsvn_subr/mergeinfo.c' \
+ # line 1172: assertion failed (IS_VALID_FORWARD_RANGE(first))
+ #
+ # Then, prior to the fix asserted this way:
+ #
+ # >svn merge -c5 ^/A@r5 A_COPY
+ # subversion\libsvn_client\merge.c:4871: (apr_err=235000)
+ # svn: E235000: In file 'subversion\libsvn_client\merge.c'
+ # line 4871: assertion failed (*gap_start < *gap_end)
sbox.simple_update()
svntest.main.run_svn(None, 'merge', '-c', 'r5', '^/A@r5',
- sbox.ospath('A_COPY'))
+ sbox.ospath('A_COPY'))
#----------------------------------------------------------------------
# Test for issue #4138 'replacement in merge source not notified correctly'.
@SkipUnless(server_has_mergeinfo)
-@XFail()
@Issue(4138)
def merge_source_with_replacement(sbox):
"replacement in merge source not notified correctly"
@@ -17472,9 +17479,22 @@ def merge_source_with_replacement(sbox):
svntest.main.run_svn(None, 'ci', '-m', 'file edit', wc_dir)
# Update and sync merge ^/A to A_COPY.
+ #
+ # text text text text text
+ # edit edit edit edit edit
+ # psi rho beta omega omega
+ # A@r1---r3----r4----r5----r6---X r7---r8--------->
+ # | | ^ |
+ # | v | |
+ # | +---replacement---+ |
+ # copy |
+ # | sync-merge
+ # | |
+ # v v
+ # r2---A_COPY----------------------------------------->
svntest.main.run_svn(None, 'up', wc_dir)
- # This currently fails because the merge notifications make it look like
- # r6 from ^/A was merged and recorded:
+ # This test previously failed because the merge notifications make it look
+ # like r6 from ^/A was merged and recorded:
#
# >svn merge ^^/A A_COPY
# --- Merging r2 through r5 into 'A_COPY':
@@ -17487,13 +17507,14 @@ def merge_source_with_replacement(sbox):
# U A_COPY\D\H\omega
# --- Recording mergeinfo for merge of r6 through r8 into 'A_COPY':
# G A_COPY
- expected_output = expected_merge_output([[2,5],[7,8]],
- ['U ' + beta_COPY_path + '\n',
- 'U ' + rho_COPY_path + '\n',
- 'U ' + omega_COPY_path + '\n',
- 'U ' + psi_COPY_path + '\n',
- ' U ' + A_COPY_path + '\n',
- ' G ' + A_COPY_path + '\n',])
+ expected_output = expected_merge_output(
+ [[2,5],[7,8]],
+ ['U ' + beta_COPY_path + '\n',
+ 'U ' + rho_COPY_path + '\n',
+ 'U ' + omega_COPY_path + '\n',
+ 'U ' + psi_COPY_path + '\n',
+ ' U ' + A_COPY_path + '\n',
+ ' G ' + A_COPY_path + '\n',])
svntest.actions.run_and_verify_svn(None, expected_output, [],
'merge', sbox.repo_url + '/A',
A_COPY_path)
@@ -17505,6 +17526,23 @@ def merge_source_with_replacement(sbox):
[], 'pg', SVN_PROP_MERGEINFO,
'-R', A_COPY_path)
+ # Commit the above merge and then reverse merge it. Again r6 is not
+ # being merged and should not be part of the notifications.
+ sbox.simple_commit()
+ sbox.simple_update()
+ expected_output = expected_merge_output(
+ [[5,2],[8,7]],
+ ['U ' + beta_COPY_path + '\n',
+ 'U ' + rho_COPY_path + '\n',
+ 'U ' + omega_COPY_path + '\n',
+ 'U ' + psi_COPY_path + '\n',
+ ' U ' + A_COPY_path + '\n',
+ ' G ' + A_COPY_path + '\n',],
+ elides=True)
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge', sbox.repo_url + '/A',
+ A_COPY_path, '-r8:1')
+
#----------------------------------------------------------------------
# Test for issue #4144 'Reverse merge with replace in source applies
# diffs in forward order'.
Modified: subversion/branches/fsfs-format7/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/cmdline/prop_tests.py?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/fsfs-format7/subversion/tests/cmdline/prop_tests.py Sun Mar 10 05:19:03 2013
@@ -2597,6 +2597,21 @@ def almost_known_prop_names(sbox):
" is not a valid svn: property name;"
" re-run with '--force' to set it")
+@Issue(3231)
+def peg_rev_base_working(sbox):
+ """peg rev @BASE, peg rev @WORKING"""
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # set up a local prop mod
+ svntest.actions.set_prop('ordinal', 'ninth\n', sbox.ospath('iota'))
+ sbox.simple_commit(message='r2')
+ svntest.actions.set_prop('cardinal', 'nine\n', sbox.ospath('iota'))
+ svntest.actions.run_and_verify_svn(None, ['ninth\n'], [],
+ 'propget', '--strict', 'ordinal',
+ sbox.ospath('iota') + '@BASE')
+
########################################################################
# Run the tests
@@ -2641,6 +2656,7 @@ test_list = [ None,
pristine_props_listed,
inheritable_ignores,
almost_known_prop_names,
+ peg_rev_base_working,
]
if __name__ == '__main__':
Modified: subversion/branches/fsfs-format7/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/cmdline/tree_conflict_tests.py?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/branches/fsfs-format7/subversion/tests/cmdline/tree_conflict_tests.py Sun Mar 10 05:19:03 2013
@@ -1407,9 +1407,11 @@ def actual_only_node_behaviour(sbox):
"unlock", foo_path)
# update (up)
+ # This doesn't skip because the update is anchored at the parent of A,
+ # the parent of A is not in conflict, and the update doesn't attempt to
+ # change foo itself.
expected_stdout = [
- "Skipped '%s' -- Node remains in conflict\n" % sbox.ospath('A/foo'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
+ "Updating '" + foo_path + "':\n", "At revision 4.\n"]
expected_stderr = []
run_and_verify_svn(None, expected_stdout, expected_stderr,
"update", foo_path)
Modified: subversion/branches/fsfs-format7/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_repos/repos-test.c?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_repos/repos-test.c Sun Mar 10 05:19:03 2013
@@ -2630,7 +2630,7 @@ reporter_depth_exclude(const svn_test_op
SVN_ERR(svn_repos_begin_report3(&report_baton, 2, repos, "/", "", NULL,
TRUE, svn_depth_infinity, FALSE, FALSE,
- editor, edit_baton, NULL, NULL, 16,
+ editor, edit_baton, NULL, NULL, 0,
subpool));
SVN_ERR(svn_repos_set_path3(report_baton, "", 1,
svn_depth_infinity,
@@ -2688,7 +2688,7 @@ reporter_depth_exclude(const svn_test_op
SVN_ERR(svn_repos_begin_report3(&report_baton, 2, repos, "/", "", NULL,
TRUE, svn_depth_infinity, FALSE, FALSE,
- editor, edit_baton, NULL, NULL, 20,
+ editor, edit_baton, NULL, NULL, 0,
subpool));
SVN_ERR(svn_repos_set_path3(report_baton, "", 1,
svn_depth_infinity,
Modified: subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/dirent_uri-test.c Sun Mar 10 05:19:03 2013
@@ -892,6 +892,14 @@ static const testcase_canonicalize_t uri
{ "file:///C%7C/temp/REPOS", "file:///C%7C/temp/REPOS" },
{ "file:///C|/temp/REPOS", "file:///C%7C/temp/REPOS" },
{ "file:///C:/", "file:///C:" },
+ { "http://[::1]/", "http://[::1]" },
+ { "http://[::1]:80/", "http://[::1]" },
+ { "https://[::1]:443", "https://[::1]" },
+ { "http://[::1]/", "http://[::1]" },
+ { "http://[::1]:80/", "http://[::1]" },
+ { "https://[::1]:443", "https://[::1]" },
+ { "http://[FACE:B00C::]/s","http://[face:b00c::]/s" },
+ { "svn+ssh://b@[1:2::3]/s","svn+ssh://b@[1:2::3]/s" },
#ifdef SVN_USE_DOS_PATHS
{ "file:///c:/temp/repos", "file:///C:/temp/repos" },
{ "file:///c:/temp/REPOS", "file:///C:/temp/REPOS" },
Modified: subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c Sun Mar 10 05:19:03 2013
@@ -5653,7 +5653,7 @@ move_update_conflicts(const svn_test_opt
SVN_ERR(sbox_wc_mkdir(&b, "X/A/B/C/D/E"));
SVN_ERR(sbox_wc_mkdir(&b, "X/A/B/F"));
SVN_ERR(sbox_wc_commit(&b, ""));
- SVN_ERR(sbox_wc_switch(&b, "/X"));
+ SVN_ERR(sbox_wc_switch(&b, "", "/X", svn_depth_infinity));
SVN_ERR(sbox_wc_update(&b, "", 1));
SVN_ERR(sbox_wc_move(&b, "A", "A2"));
SVN_ERR(sbox_wc_move(&b, "A2/B/C", "A2/B/C2"));
@@ -6001,7 +6001,7 @@ switch_move(const svn_test_opts_t *opts,
SVN_ERR(sbox_wc_commit(&b, ""));
SVN_ERR(sbox_wc_mkdir(&b, "X/B/D/E/F"));
SVN_ERR(sbox_wc_commit(&b, ""));
- SVN_ERR(sbox_wc_switch(&b, "/A"));
+ SVN_ERR(sbox_wc_switch(&b, "", "/A", svn_depth_infinity));
SVN_ERR(sbox_wc_update(&b, "", 2));
SVN_ERR(sbox_wc_move(&b, "B/C", "C2"));
@@ -6029,7 +6029,7 @@ switch_move(const svn_test_opts_t *opts,
/* Switch "bumps" revisions and paths and raises conflicts just like
update. */
- SVN_ERR(sbox_wc_switch(&b, "/X"));
+ SVN_ERR(sbox_wc_switch(&b, "", "/X", svn_depth_infinity));
{
nodes_row_t nodes[] = {
{0, "", "normal", 3, "X"},
@@ -7299,7 +7299,7 @@ move_back(const svn_test_opts_t *opts, a
SVN_ERR(sbox_wc_mkdir(&b, "X/A/B/D"));
SVN_ERR(sbox_wc_mkdir(&b, "X/E"));
SVN_ERR(sbox_wc_commit(&b, ""));
- SVN_ERR(sbox_wc_switch(&b, "/X"));
+ SVN_ERR(sbox_wc_switch(&b, "", "/X", svn_depth_infinity));
SVN_ERR(sbox_wc_move(&b, "A/B", "A/B2"));
{
@@ -7399,6 +7399,11 @@ move_update_subtree(const svn_test_opts_
SVN_ERR(sbox_wc_commit(&b, ""));
SVN_ERR(sbox_wc_mkdir(&b, "A/B/C/D"));
SVN_ERR(sbox_wc_commit(&b, ""));
+ SVN_ERR(sbox_wc_mkdir(&b, "X"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
+ SVN_ERR(sbox_wc_update(&b, "", 3));
+ SVN_ERR(sbox_wc_copy(&b, "A", "P"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
SVN_ERR(sbox_wc_update(&b, "", 1));
/* Subtree update is like an interrupted update, it leaves a
@@ -7468,6 +7473,138 @@ move_update_subtree(const svn_test_opts_
SVN_ERR(check_db_rows(&b, "", nodes));
}
+ /* Subtree update that only bumps. */
+ SVN_ERR(sbox_wc_update(&b, "A/B/C", 3));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 2, "A/B"},
+ {0, "A/B/C", "normal", 3, "A/B/C"},
+ {0, "A/B/C/D", "normal", 3, "A/B/C/D"},
+ {2, "A/B", "base-deleted", NO_COPY_FROM, "A/B2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {2, "A/B/C/D", "base-deleted", NO_COPY_FROM},
+ {2, "A/B2", "normal", 2, "A/B", MOVED_HERE},
+ {2, "A/B2/C", "normal", 2, "A/B/C", MOVED_HERE},
+ {2, "A/B2/C/D", "normal", 2, "A/B/C/D", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Resolve fails because of the mixed-revision. */
+ err = sbox_wc_resolve(&b, "A/B", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict);
+ SVN_TEST_ASSERT_ERROR(err, SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE);
+
+ /* Update allowed while tree-conflict is present. */
+ SVN_ERR(sbox_wc_update(&b, "A/B", 3));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 3, "A/B"},
+ {0, "A/B/C", "normal", 3, "A/B/C"},
+ {0, "A/B/C/D", "normal", 3, "A/B/C/D"},
+ {2, "A/B", "base-deleted", NO_COPY_FROM, "A/B2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {2, "A/B/C/D", "base-deleted", NO_COPY_FROM},
+ {2, "A/B2", "normal", 2, "A/B", MOVED_HERE},
+ {2, "A/B2/C", "normal", 2, "A/B/C", MOVED_HERE},
+ {2, "A/B2/C/D", "normal", 2, "A/B/C/D", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Now resolve works. */
+ SVN_ERR(sbox_wc_resolve(&b, "A/B", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 3, "A/B"},
+ {0, "A/B/C", "normal", 3, "A/B/C"},
+ {0, "A/B/C/D", "normal", 3, "A/B/C/D"},
+ {2, "A/B", "base-deleted", NO_COPY_FROM, "A/B2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {2, "A/B/C/D", "base-deleted", NO_COPY_FROM},
+ {2, "A/B2", "normal", 3, "A/B", MOVED_HERE},
+ {2, "A/B2/C", "normal", 3, "A/B/C", MOVED_HERE},
+ {2, "A/B2/C/D", "normal", 3, "A/B/C/D", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Partial switch of source. */
+ SVN_ERR(sbox_wc_switch(&b, "A", "/P", svn_depth_immediates));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 4, "P"},
+ {0, "A/B", "normal", 4, "P/B"},
+ {0, "A/B/C", "normal", 3, "A/B/C"},
+ {0, "A/B/C/D", "normal", 3, "A/B/C/D"},
+ {2, "A/B", "base-deleted", NO_COPY_FROM, "A/B2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {2, "A/B/C/D", "base-deleted", NO_COPY_FROM},
+ {2, "A/B2", "normal", 3, "A/B", MOVED_HERE},
+ {2, "A/B2/C", "normal", 3, "A/B/C", MOVED_HERE},
+ {2, "A/B2/C/D", "normal", 3, "A/B/C/D", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Resolve fails because of the subtree-switch. */
+ err = sbox_wc_resolve(&b, "A/B", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict);
+ SVN_TEST_ASSERT_ERROR(err, SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE);
+
+ /* Switch works while tree-conflict is present. */
+ SVN_ERR(sbox_wc_switch(&b, "A", "/P", svn_depth_infinity));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 4, "P"},
+ {0, "A/B", "normal", 4, "P/B"},
+ {0, "A/B/C", "normal", 4, "P/B/C"},
+ {0, "A/B/C/D", "normal", 4, "P/B/C/D"},
+ {2, "A/B", "base-deleted", NO_COPY_FROM, "A/B2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {2, "A/B/C/D", "base-deleted", NO_COPY_FROM},
+ {2, "A/B2", "normal", 3, "A/B", MOVED_HERE},
+ {2, "A/B2/C", "normal", 3, "A/B/C", MOVED_HERE},
+ {2, "A/B2/C/D", "normal", 3, "A/B/C/D", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Now resolve works. */
+ SVN_ERR(sbox_wc_resolve(&b, "A/B", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 4, "P"},
+ {0, "A/B", "normal", 4, "P/B"},
+ {0, "A/B/C", "normal", 4, "P/B/C"},
+ {0, "A/B/C/D", "normal", 4, "P/B/C/D"},
+ {2, "A/B", "base-deleted", NO_COPY_FROM, "A/B2"},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {2, "A/B/C/D", "base-deleted", NO_COPY_FROM},
+ {2, "A/B2", "normal", 4, "P/B", MOVED_HERE},
+ {2, "A/B2/C", "normal", 4, "P/B/C", MOVED_HERE},
+ {2, "A/B2/C/D", "normal", 4, "P/B/C/D", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
return SVN_NO_ERROR;
}
@@ -7613,7 +7750,7 @@ struct svn_test_descriptor_t test_funcs[
"new_basemove"),
SVN_TEST_OPTS_PASS(move_back,
"move_back (issue 4302)"),
- SVN_TEST_OPTS_XFAIL(move_update_subtree,
+ SVN_TEST_OPTS_PASS(move_update_subtree,
"move_update_subtree (issue 4232)"),
SVN_TEST_NULL
};
Modified: subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.c?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.c Sun Mar 10 05:19:03 2013
@@ -344,7 +344,10 @@ sbox_wc_update(svn_test__sandbox_t *b, c
}
svn_error_t *
-sbox_wc_switch(svn_test__sandbox_t *b, const char *url)
+sbox_wc_switch(svn_test__sandbox_t *b,
+ const char *path,
+ const char *url,
+ svn_depth_t depth)
{
svn_client_ctx_t *ctx;
svn_revnum_t result_rev;
@@ -353,8 +356,8 @@ sbox_wc_switch(svn_test__sandbox_t *b, c
url = apr_pstrcat(b->pool, b->repos_url, url, (char*)NULL);
SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
ctx->wc_ctx = b->wc_ctx;
- return svn_client_switch3(&result_rev, sbox_wc_path(b, ""), url,
- &head_rev, &head_rev, svn_depth_infinity,
+ return svn_client_switch3(&result_rev, sbox_wc_path(b, path), url,
+ &head_rev, &head_rev, depth,
FALSE /* depth_is_sticky */,
TRUE /* ignore_externals */,
FALSE /* allow_unver_obstructions */,
Modified: subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.h?rev=1454792&r1=1454791&r2=1454792&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.h (original)
+++ subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.h Sun Mar 10 05:19:03 2013
@@ -137,7 +137,10 @@ sbox_wc_update_depth(svn_test__sandbox_t
svn_depth_t depth);
svn_error_t *
-sbox_wc_switch(svn_test__sandbox_t *b, const char *url);
+sbox_wc_switch(svn_test__sandbox_t *b,
+ const char *path,
+ const char *url,
+ svn_depth_t depth);
/* */
svn_error_t *
Propchange: subversion/branches/fsfs-format7/tools/dist/make-deps-tarball.sh
------------------------------------------------------------------------------
Merged /subversion/trunk/tools/dist/make-deps-tarball.sh:r1453267-1454790