Author: julianfoad
Date: Fri Dec 7 16:08:32 2012
New Revision: 1418372
URL: http://svn.apache.org/viewvc?rev=1418372&view=rev
Log:
In the libsvn_wc unit tests, let sbox_wc_resolve() take an argument saying
how to resolve.
* subversion/tests/libsvn_wc/utils.h,
* subversion/tests/libsvn_wc/utils.c
(sbox_wc_resolve): Take a 'conflict_choice' paramter.
* subversion/tests/libsvn_wc/op-depth-test.c
(move_update): Update callers.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
subversion/trunk/subversion/tests/libsvn_wc/utils.c
subversion/trunk/subversion/tests/libsvn_wc/utils.h
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1418372&r1=1418371&r2=1418372&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Fri Dec 7
16:08:32 2012
@@ -4351,7 +4351,7 @@ move_update(const svn_test_opts_t *opts,
}
/* Resolve should update the move. */
- SVN_ERR(sbox_wc_resolve(&b, "A"));
+ SVN_ERR(sbox_wc_resolve(&b, "A", svn_wc_conflict_choose_mine_conflict));
{
nodes_row_t nodes[] = {
{0, "", "normal", 2, ""},
@@ -4394,7 +4394,7 @@ move_update(const svn_test_opts_t *opts,
SVN_ERR(check_db_rows(&b, "", nodes));
}
- SVN_ERR(sbox_wc_resolve(&b, "A"));
+ SVN_ERR(sbox_wc_resolve(&b, "A", svn_wc_conflict_choose_mine_conflict));
{
nodes_row_t nodes[] = {
{0, "", "normal", 3, ""},
@@ -4440,7 +4440,7 @@ move_update(const svn_test_opts_t *opts,
}
SVN_ERR(sbox_wc_update(&b, "", 2));
- SVN_ERR(sbox_wc_resolve(&b, "A"));
+ SVN_ERR(sbox_wc_resolve(&b, "A", svn_wc_conflict_choose_mine_conflict));
{
nodes_row_t nodes[] = {
{0, "", "normal", 2, ""},
Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1418372&r1=1418371&r2=1418372&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Fri Dec 7 16:08:32 2012
@@ -329,14 +329,14 @@ sbox_wc_resolved(svn_test__sandbox_t *b,
}
svn_error_t *
-sbox_wc_resolve(svn_test__sandbox_t *b, const char *path)
+sbox_wc_resolve(svn_test__sandbox_t *b, const char *path,
+ svn_wc_conflict_choice_t conflict_choice)
{
svn_client_ctx_t *ctx;
SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
return svn_client_resolve(sbox_wc_path(b, path), svn_depth_infinity,
- svn_wc_conflict_choose_mine_conflict,
- ctx, b->pool);
+ conflict_choice, ctx, b->pool);
}
svn_error_t *
Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.h?rev=1418372&r1=1418371&r2=1418372&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.h (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.h Fri Dec 7 16:08:32 2012
@@ -130,7 +130,8 @@ sbox_wc_resolved(svn_test__sandbox_t *b,
/* */
svn_error_t *
-sbox_wc_resolve(svn_test__sandbox_t *b, const char *path);
+sbox_wc_resolve(svn_test__sandbox_t *b, const char *path,
+ svn_wc_conflict_choice_t conflict_choice);
/* */
svn_error_t *
