Author: julianfoad
Date: Thu Oct 18 17:09:24 2012
New Revision: 1399738
URL: http://svn.apache.org/viewvc?rev=1399738&view=rev
Log:
Rename 'symmetric merge' to 'automatic merge' throughout the code base.
* subversion/include/private/svn_client_private.h
(svn_client__symmetric_merge_get_locations): Rename to
svn_client__automatic_merge_get_locations.
* subversion/include/svn_client.h
(svn_client_symmetric_merge_t, svn_client_find_symmetric_merge,
svn_client_find_symmetric_merge_no_wc, svn_client_do_symmetric_merge,
svn_client_symmetric_merge_is_reintegrate_like): Rename to
svn_client_automatic_merge_t, svn_client_find_automatic_merge,
svn_client_find_automatic_merge_no_wc, svn_client_do_automatic_merge,
svn_client_automatic_merge_is_reintegrate_like.
* subversion/libsvn_client/merge.c
(find_symmetric_merge, svn_client_symmetric_merge_t,
svn_client_find_symmetric_merge_no_wc, svn_client_find_symmetric_merge,
do_symmetric_merge_locked, svn_client_do_symmetric_merge,
svn_client_symmetric_merge_is_reintegrate_like,
svn_client__symmetric_merge_get_locations): Rename to
find_automatic_merge, svn_client_automatic_merge_t,
svn_client_find_automatic_merge_no_wc, svn_client_find_automatic_merge,
do_automatic_merge_locked, svn_client_do_automatic_merge,
svn_client_automatic_merge_is_reintegrate_like,
svn_client__automatic_merge_get_locations.
* subversion/svn/merge-cmd.c
(symmetric_merge): Rename to automatic_merge.
(svn_cl__merge): Track the renames.
* subversion/svn/mergeinfo-cmd.c
(mergeinfo_summary): Track the renames.
* subversion/tests/cmdline/merge_symmetric_tests.py
Rename to merge_automatic_tests.py, and rename everything inside it too.
Added:
subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
- copied, changed from r1399501,
subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Removed:
subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Modified:
subversion/trunk/subversion/include/private/svn_client_private.h
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/svn/merge-cmd.c
subversion/trunk/subversion/svn/mergeinfo-cmd.c
Modified: subversion/trunk/subversion/include/private/svn_client_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_client_private.h?rev=1399738&r1=1399737&r2=1399738&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Thu Oct 18
17:09:24 2012
@@ -233,12 +233,12 @@ svn_client__wc_node_get_origin(svn_clien
* Any of the output pointers may be NULL if not wanted.
*/
svn_error_t *
-svn_client__symmetric_merge_get_locations(
+svn_client__automatic_merge_get_locations(
svn_client__pathrev_t **yca,
svn_client__pathrev_t **base,
svn_client__pathrev_t **right,
svn_client__pathrev_t **target,
- const svn_client_symmetric_merge_t *merge,
+ const svn_client_automatic_merge_t *merge,
apr_pool_t *result_pool);
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1399738&r1=1399737&r2=1399738&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Oct 18 17:09:24 2012
@@ -3376,8 +3376,8 @@ svn_client_diff_summarize_peg(const char
* @{
*/
-/* Details of a symmetric merge. */
-typedef struct svn_client_symmetric_merge_t svn_client_symmetric_merge_t;
+/* Details of an automatic merge. */
+typedef struct svn_client_automatic_merge_t svn_client_automatic_merge_t;
/* Find the information needed to merge all unmerged changes from a source
* branch into a target branch. The information is the locations of the
@@ -3388,7 +3388,7 @@ typedef struct svn_client_symmetric_merg
* SOURCE_REVISION into the target WC at TARGET_WCPATH.
*/
svn_error_t *
-svn_client_find_symmetric_merge(svn_client_symmetric_merge_t **merge,
+svn_client_find_automatic_merge(svn_client_automatic_merge_t **merge,
const char *source_path_or_url,
const svn_opt_revision_t *source_revision,
const char *target_wcpath,
@@ -3399,22 +3399,22 @@ svn_client_find_symmetric_merge(svn_clie
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Find out what kind of symmetric merge would be needed, when the target
+/* Find out what kind of automatic merge would be needed, when the target
* is only known as a repository location rather than a WC.
*
- * Like svn_client_find_symmetric_merge() except that SOURCE_PATH_OR_URL @
+ * Like svn_client_find_automatic_merge() except that SOURCE_PATH_OR_URL @
* SOURCE_REVISION should refer to a repository location and not a WC.
*
* ### The result, *MERGE_P, may not be suitable for passing to
- * svn_client_do_symmetric_merge(). The target WC state would not be
+ * svn_client_do_automatic_merge(). The target WC state would not be
* checked (as in the ALLOW_* flags). We should resolve this problem:
* perhaps add the allow_* params here, or provide another way of setting
* them; and perhaps ensure __do_...() will accept the result iff given a
* WC that matches the stored target location.
*/
svn_error_t *
-svn_client_find_symmetric_merge_no_wc(
- svn_client_symmetric_merge_t **merge_p,
+svn_client_find_automatic_merge_no_wc(
+ svn_client_automatic_merge_t **merge_p,
const char *source_path_or_url,
const svn_opt_revision_t *source_revision,
const char *target_path_or_url,
@@ -3423,22 +3423,22 @@ svn_client_find_symmetric_merge_no_wc(
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Perform a symmetric merge.
+/* Perform an automatic merge.
*
* Merge according to MERGE into the WC at TARGET_WCPATH.
*
* The other parameters are as in svn_client_merge4().
*
* ### TODO: There's little point in this function being the only way the
- * caller can use the result of svn_client_find_symmetric_merge(). The
+ * caller can use the result of svn_client_find_automatic_merge(). The
* contents of MERGE should be more public, or there should be other ways
* the caller can use it, or these two functions should be combined into
* one. I want to make it more public, and also possibly have more ways
- * to use it in future (for example, do_symmetric_merge_with_step_by_-
+ * to use it in future (for example, do_automatic_merge_with_step_by_-
* step_confirmation).
*/
svn_error_t *
-svn_client_do_symmetric_merge(const svn_client_symmetric_merge_t *merge,
+svn_client_do_automatic_merge(const svn_client_automatic_merge_t *merge,
const char *target_wcpath,
svn_depth_t depth,
svn_boolean_t force,
@@ -3448,16 +3448,16 @@ svn_client_do_symmetric_merge(const svn_
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
-/* Return TRUE iff the symmetric merge represented by MERGE is going to be
+/* Return TRUE iff the automatic merge represented by MERGE is going to be
* a reintegrate-like merge: that is, merging in the opposite direction
* from the last full merge.
*
- * This function exists because the merge is NOT really symmetric and the
+ * This function exists because the merge is NOT really automatic and the
* client can be more friendly if it knows something about the differences.
*/
svn_boolean_t
-svn_client_symmetric_merge_is_reintegrate_like(
- const svn_client_symmetric_merge_t *merge);
+svn_client_automatic_merge_is_reintegrate_like(
+ const svn_client_automatic_merge_t *merge);
/** Merge changes from @a source1/@a revision1 to @a source2/@a revision2 into
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1399738&r1=1399737&r2=1399738&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Oct 18 17:09:24 2012
@@ -11401,10 +11401,10 @@ find_base_on_target(svn_client__pathrev_
return SVN_NO_ERROR;
}
-/* The body of svn_client_find_symmetric_merge(), which see.
+/* The body of svn_client_find_automatic_merge(), which see.
*/
static svn_error_t *
-find_symmetric_merge(svn_client__pathrev_t **base_p,
+find_automatic_merge(svn_client__pathrev_t **base_p,
svn_client__pathrev_t **mid_p,
source_and_target_t *s_t,
svn_client_ctx_t *ctx,
@@ -11481,16 +11481,16 @@ find_symmetric_merge(svn_client__pathrev
return SVN_NO_ERROR;
}
-/* Details of a symmetric merge. */
-struct svn_client_symmetric_merge_t
+/* Details of an automatic merge. */
+struct svn_client_automatic_merge_t
{
svn_client__pathrev_t *yca, *base, *mid, *right, *target;
svn_boolean_t allow_mixed_rev, allow_local_mods, allow_switched_subtrees;
};
svn_error_t *
-svn_client_find_symmetric_merge_no_wc(
- svn_client_symmetric_merge_t **merge_p,
+svn_client_find_automatic_merge_no_wc(
+ svn_client_automatic_merge_t **merge_p,
const char *source_path_or_url,
const svn_opt_revision_t *source_revision,
const char *target_path_or_url,
@@ -11501,7 +11501,7 @@ svn_client_find_symmetric_merge_no_wc(
{
source_and_target_t *s_t = apr_palloc(scratch_pool, sizeof(*s_t));
svn_client__pathrev_t *target_loc;
- svn_client_symmetric_merge_t *merge = apr_palloc(result_pool,
sizeof(*merge));
+ svn_client_automatic_merge_t *merge = apr_palloc(result_pool,
sizeof(*merge));
/* Source */
SVN_ERR(svn_client__ra_session_from_path2(
@@ -11519,7 +11519,7 @@ svn_client_find_symmetric_merge_no_wc(
s_t->target->abspath = NULL; /* indicate the target is not a WC */
s_t->target->loc = *target_loc;
- SVN_ERR(find_symmetric_merge(&merge->base, &merge->mid, s_t,
+ SVN_ERR(find_automatic_merge(&merge->base, &merge->mid, s_t,
ctx, result_pool, scratch_pool));
merge->right = s_t->source;
@@ -11531,7 +11531,7 @@ svn_client_find_symmetric_merge_no_wc(
}
svn_error_t *
-svn_client_find_symmetric_merge(svn_client_symmetric_merge_t **merge_p,
+svn_client_find_automatic_merge(svn_client_automatic_merge_t **merge_p,
const char *source_path_or_url,
const svn_opt_revision_t *source_revision,
const char *target_wcpath,
@@ -11544,14 +11544,14 @@ svn_client_find_symmetric_merge(svn_clie
{
const char *target_abspath;
source_and_target_t *s_t = apr_palloc(result_pool, sizeof(*s_t));
- svn_client_symmetric_merge_t *merge = apr_palloc(result_pool,
sizeof(*merge));
+ svn_client_automatic_merge_t *merge = apr_palloc(result_pool,
sizeof(*merge));
SVN_ERR(svn_dirent_get_absolute(&target_abspath, target_wcpath,
scratch_pool));
/* "Open" the target WC. We're not going to check the target WC for
* mixed-rev, local mods or switched subtrees yet. After we find out
* what kind of merge is required, then if a reintegrate-like merge is
- * required we'll do the stricter checks, in do_symmetric_merge_locked(). */
+ * required we'll do the stricter checks, in do_automatic_merge_locked(). */
SVN_ERR(open_target_wc(&s_t->target, target_abspath,
TRUE /*allow_mixed_rev*/,
TRUE /*allow_local_mods*/,
@@ -11573,7 +11573,7 @@ svn_client_find_symmetric_merge(svn_clie
&s_t->target->loc, target_wcpath,
TRUE /* strict_urls */, scratch_pool));
- SVN_ERR(find_symmetric_merge(&merge->base, &merge->mid, s_t,
+ SVN_ERR(find_automatic_merge(&merge->base, &merge->mid, s_t,
ctx, result_pool, scratch_pool));
merge->yca = s_t->yca;
merge->right = s_t->source;
@@ -11588,7 +11588,7 @@ svn_client_find_symmetric_merge(svn_clie
return SVN_NO_ERROR;
}
-/* The body of svn_client_do_symmetric_merge(), which see.
+/* The body of svn_client_do_automatic_merge(), which see.
*
* Five locations are inputs: YCA, BASE, MID, RIGHT, TARGET, as shown
* depending on whether the base is on the source branch or the target
@@ -11616,7 +11616,7 @@ svn_client_find_symmetric_merge(svn_clie
* eliminate already-cherry-picked revisions from the source.
*/
static svn_error_t *
-do_symmetric_merge_locked(const svn_client_symmetric_merge_t *merge,
+do_automatic_merge_locked(const svn_client_automatic_merge_t *merge,
const char *target_abspath,
svn_depth_t depth,
svn_boolean_t force,
@@ -11706,7 +11706,7 @@ do_symmetric_merge_locked(const svn_clie
gaps that are older than the base that we calculated (which is
for the root path of the merge).
- An improvement would be to change find_symmetric_merge() to
+ An improvement would be to change find_automatic_merge() to
find the base for each sutree, and then here use the oldest base
among all subtrees. */
merge_source_t source;
@@ -11735,7 +11735,7 @@ do_symmetric_merge_locked(const svn_clie
}
svn_error_t *
-svn_client_do_symmetric_merge(const svn_client_symmetric_merge_t *merge,
+svn_client_do_automatic_merge(const svn_client_automatic_merge_t *merge,
const char *target_wcpath,
svn_depth_t depth,
svn_boolean_t force,
@@ -11752,13 +11752,13 @@ svn_client_do_symmetric_merge(const svn_
if (!dry_run)
SVN_WC__CALL_WITH_WRITE_LOCK(
- do_symmetric_merge_locked(merge,
+ do_automatic_merge_locked(merge,
target_abspath, depth,
force, record_only, dry_run,
merge_options, ctx, pool),
ctx->wc_ctx, lock_abspath, FALSE /* lock_anchor */, pool);
else
- SVN_ERR(do_symmetric_merge_locked(merge,
+ SVN_ERR(do_automatic_merge_locked(merge,
target_abspath, depth,
force, record_only, dry_run,
merge_options, ctx, pool));
@@ -11767,19 +11767,19 @@ svn_client_do_symmetric_merge(const svn_
}
svn_boolean_t
-svn_client_symmetric_merge_is_reintegrate_like(
- const svn_client_symmetric_merge_t *merge)
+svn_client_automatic_merge_is_reintegrate_like(
+ const svn_client_automatic_merge_t *merge)
{
return merge->mid != NULL;
}
svn_error_t *
-svn_client__symmetric_merge_get_locations(
+svn_client__automatic_merge_get_locations(
svn_client__pathrev_t **yca,
svn_client__pathrev_t **base,
svn_client__pathrev_t **right,
svn_client__pathrev_t **target,
- const svn_client_symmetric_merge_t *merge,
+ const svn_client_automatic_merge_t *merge,
apr_pool_t *result_pool)
{
if (yca)
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1399738&r1=1399737&r2=1399738&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Thu Oct 18 17:09:24 2012
@@ -104,9 +104,9 @@ ensure_wc_path_has_repo_revision(const c
return SVN_NO_ERROR;
}
-/* Symmetric, merge-tracking merge, used for sync or reintegrate purposes. */
+/* Automatic, merge-tracking merge, used for sync or reintegrate purposes. */
static svn_error_t *
-symmetric_merge(const char *source_path_or_url,
+automatic_merge(const char *source_path_or_url,
const svn_opt_revision_t *source_revision,
const char *target_wcpath,
svn_depth_t depth,
@@ -120,16 +120,16 @@ symmetric_merge(const char *source_path_
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
{
- svn_client_symmetric_merge_t *merge;
+ svn_client_automatic_merge_t *merge;
/* Find the 3-way merges needed (and check suitability of the WC). */
- SVN_ERR(svn_client_find_symmetric_merge(&merge,
+ SVN_ERR(svn_client_find_automatic_merge(&merge,
source_path_or_url, source_revision,
target_wcpath, allow_mixed_rev,
allow_local_mods,
allow_switched_subtrees,
ctx, scratch_pool, scratch_pool));
- if (svn_client_symmetric_merge_is_reintegrate_like(merge))
+ if (svn_client_automatic_merge_is_reintegrate_like(merge))
{
if (record_only)
return svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
@@ -157,7 +157,7 @@ symmetric_merge(const char *source_path_
}
/* Perform the 3-way merges */
- SVN_ERR(svn_client_do_symmetric_merge(merge, target_wcpath, depth,
+ SVN_ERR(svn_client_do_automatic_merge(merge, target_wcpath, depth,
force, record_only,
dry_run, merge_options,
ctx, scratch_pool));
@@ -428,7 +428,7 @@ svn_cl__merge(apr_getopt_t *os,
/* Postpone conflict resolution during the merge operation.
* If any conflicts occur we'll run the conflict resolver later. */
- /* Do a symmetric merge if just one source and no revisions. */
+ /* Do an automatic merge if just one source and no revisions. */
if ((! two_sources_specified)
&& (! opt_state->reintegrate)
&& (! opt_state->ignore_ancestry)
@@ -440,7 +440,7 @@ svn_cl__merge(apr_getopt_t *os,
ctx, pool),
_("Source and target must be different but related branches"));
- merge_err = symmetric_merge(sourcepath1, &peg_revision1, targetpath,
+ merge_err = automatic_merge(sourcepath1, &peg_revision1, targetpath,
opt_state->depth,
opt_state->force,
opt_state->record_only,
Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1399738&r1=1399737&r2=1399738&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Thu Oct 18 17:09:24 2012
@@ -205,7 +205,7 @@ mergeinfo_summary(
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
- svn_client_symmetric_merge_t *the_merge;
+ svn_client_automatic_merge_t *the_merge;
svn_client__pathrev_t *yca, *base, *right, *target;
svn_boolean_t target_is_wc, reintegrate_like;
@@ -213,22 +213,22 @@ mergeinfo_summary(
&& (target_revision->kind == svn_opt_revision_unspecified
|| target_revision->kind == svn_opt_revision_working);
if (target_is_wc)
- SVN_ERR(svn_client_find_symmetric_merge(
+ SVN_ERR(svn_client_find_automatic_merge(
&the_merge,
source_path_or_url, source_revision,
target_path_or_url,
TRUE, TRUE, TRUE, /* allow_* */
ctx, pool, pool));
else
- SVN_ERR(svn_client_find_symmetric_merge_no_wc(
+ SVN_ERR(svn_client_find_automatic_merge_no_wc(
&the_merge,
source_path_or_url, source_revision,
target_path_or_url, target_revision,
ctx, pool, pool));
- SVN_ERR(svn_client__symmetric_merge_get_locations(
+ SVN_ERR(svn_client__automatic_merge_get_locations(
&yca, &base, &right, &target, the_merge, pool));
- reintegrate_like = svn_client_symmetric_merge_is_reintegrate_like(the_merge);
+ reintegrate_like = svn_client_automatic_merge_is_reintegrate_like(the_merge);
SVN_ERR(mergeinfo_diagram(yca, base, right, target,
target_is_wc, reintegrate_like,
Copied: subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
(from r1399501,
subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py?p2=subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py&p1=subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py&r1=1399501&r2=1399738&rev=1399738&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Thu Oct
18 17:09:24 2012
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# merge_symmetric_tests.py: testing "symmetric merge" scenarios
+# merge_automatic_tests.py: testing "automatic merge" scenarios
#
# Subversion is a tool for revision control.
# See http://subversion.apache.org for more information.
@@ -206,7 +206,7 @@ def get_3ways_from_output(output):
Return a list of (base, source-right) tuples."""
### Problem: test suite strips debugging output within run_and_verify_...()
### so we don't see it here. And relying on debug output is a temporary
- ### measure only. Better to access svn_client_find_symmetric_merge()
+ ### measure only. Better to access svn_client_find_automatic_merge()
### directly, via bindings?
merges = []
@@ -251,7 +251,7 @@ def modify_branch(sbox, branch, number,
sbox.simple_copy(branch + '/mu', branch + '/mu-' + uniq)
sbox.simple_commit()
-def expected_symmetric_merge_output(target, expect_3ways):
+def expected_automatic_merge_output(target, expect_3ways):
"""Calculate the expected output."""
# (This is rather specific to the current implementation.)
@@ -275,7 +275,7 @@ def expected_symmetric_merge_output(targ
# Match mergeinfo changes. (### Subtrees are not yet supported here.)
lines += [" [UG] " + target + "\n"]
- # At the moment, the symmetric merge code sometimes says 'Merging
+ # At the moment, the automatic merge code sometimes says 'Merging
# differences between repository URLs' and sometimes 'Merging r3 through
# r5', but it's not trivial to predict which, so expect either form.
lines += ["--- Merging .* into '%s':\n" % (target,),
@@ -283,7 +283,7 @@ def expected_symmetric_merge_output(targ
return expected_merge_output(rev_ranges, lines, target=target)
-def symmetric_merge(sbox, source, target, args=[],
+def automatic_merge(sbox, source, target, args=[],
expect_changes=None, expect_mi=None, expect_3ways=None):
"""Do a complete, automatic merge from path SOURCE to path TARGET, and
commit. Verify the output and that there is no error.
@@ -299,7 +299,7 @@ def symmetric_merge(sbox, source, target
before_changes = logical_changes_in_branch(sbox, target)
- exp_out = expected_symmetric_merge_output(target, expect_3ways)
+ exp_out = expected_automatic_merge_output(target, expect_3ways)
exit, out, err = svntest.actions.run_and_verify_svn(None, exp_out, [],
'merge',
'^/' + source, target,
@@ -362,7 +362,7 @@ def init_mod_merge_mod(sbox, mod_6, mod_
modify_branch(sbox, 'A', 3)
modify_branch(sbox, 'B', 4)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A3'],
expect_mi=[2, 3, 4],
expect_3ways=[three_way_merge('A1', 'A4')])
@@ -394,7 +394,7 @@ def merge_once_1(sbox):
no_op_commit(sbox) # r3
no_op_commit(sbox) # r4
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=[],
expect_mi=[2, 3, 4],
expect_3ways=[three_way_merge_no_op('A1', 'A4')])
@@ -412,7 +412,7 @@ def merge_once_2(sbox):
modify_branch(sbox, 'A', 3)
no_op_commit(sbox) # r4
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A3'],
expect_mi=[2, 3, 4],
expect_3ways=[three_way_merge('A1', 'A4')])
@@ -430,7 +430,7 @@ def merge_once_3(sbox):
no_op_commit(sbox) # r3
modify_branch(sbox, 'B', 4)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=[],
expect_mi=[2, 3, 4],
expect_3ways=[three_way_merge_no_op('A1', 'A4')])
@@ -448,7 +448,7 @@ def merge_once_4(sbox):
modify_branch(sbox, 'A', 3)
modify_branch(sbox, 'B', 4)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A3'],
expect_mi=[2, 3, 4],
expect_3ways=[three_way_merge('A1', 'A4')])
@@ -468,7 +468,7 @@ def merge_twice_same_direction_1(sbox):
init_mod_merge_mod(sbox, mod_6=False, mod_7=False)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=[],
expect_mi=[5, 6, 7],
expect_3ways=[three_way_merge_no_op('A4', 'A7')])
@@ -484,7 +484,7 @@ def merge_twice_same_direction_2(sbox):
init_mod_merge_mod(sbox, mod_6=True, mod_7=True)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A6'],
expect_mi=[5, 6, 7],
expect_3ways=[three_way_merge('A4', 'A7')])
@@ -504,7 +504,7 @@ def merge_to_and_fro_1_1(sbox):
init_mod_merge_mod(sbox, mod_6=False, mod_7=False)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=['B4'],
expect_mi=[2, 3, 4, 5, 6, 7],
expect_3ways=[three_way_merge('A4', 'B7')])
@@ -520,7 +520,7 @@ def merge_to_and_fro_1_2(sbox):
init_mod_merge_mod(sbox, mod_6=True, mod_7=True)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=['B4', 'B7'],
expect_mi=[2, 3, 4, 5, 6, 7],
expect_3ways=[three_way_merge('A4', 'B7')])
@@ -537,7 +537,7 @@ def init_merge_to_and_fro_2(sbox, mod_9,
init_mod_merge_mod(sbox, mod_6=True, mod_7=True)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A6'],
expect_mi=[5, 6, 7],
expect_3ways=[three_way_merge('A4', 'A7')])
@@ -563,7 +563,7 @@ def merge_to_and_fro_2_1(sbox):
init_merge_to_and_fro_2(sbox, mod_9=False, mod_10=False)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=['B4', 'B7'],
expect_mi=[2, 3, 4, 5, 6, 7, 8, 9, 10],
expect_3ways=[three_way_merge('A7', 'B10')])
@@ -579,7 +579,7 @@ def merge_to_and_fro_2_2(sbox):
init_merge_to_and_fro_2(sbox, mod_9=True, mod_10=True)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=['B4', 'B7', 'B10'],
expect_mi=[2, 3, 4, 5, 6, 7, 8, 9, 10],
expect_3ways=[three_way_merge('A7', 'B10')])
@@ -596,7 +596,7 @@ def init_merge_to_and_fro_3(sbox, mod_9,
init_mod_merge_mod(sbox, mod_6=True, mod_7=True)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=['B4', 'B7'],
expect_mi=[2, 3, 4, 5, 6, 7],
expect_3ways=[three_way_merge('A4', 'B7')])
@@ -622,7 +622,7 @@ def merge_to_and_fro_3_1(sbox):
init_merge_to_and_fro_3(sbox, mod_9=False, mod_10=False)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=[],
expect_mi=[8, 9, 10],
expect_3ways=[three_way_merge_no_op('B7', 'B10')])
@@ -638,7 +638,7 @@ def merge_to_and_fro_3_2(sbox):
init_merge_to_and_fro_3(sbox, mod_9=True, mod_10=True)
- symmetric_merge(sbox, 'B', 'A',
+ automatic_merge(sbox, 'B', 'A',
expect_changes=['B10'],
expect_mi=[8, 9, 10],
expect_3ways=[three_way_merge('B7', 'B10')])
@@ -654,7 +654,7 @@ def merge_to_and_fro_4_1(sbox):
init_merge_to_and_fro_3(sbox, mod_9=False, mod_10=False)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A6'],
expect_mi=[5, 6, 7, 8, 9, 10],
expect_3ways=[three_way_merge_no_op('B7', 'A10')])
@@ -670,7 +670,7 @@ def merge_to_and_fro_4_2(sbox):
init_merge_to_and_fro_3(sbox, mod_9=True, mod_10=True)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A6', 'A9'],
expect_mi=[5, 6, 7, 8, 9, 10],
expect_3ways=[three_way_merge('B7', 'A10')])
@@ -693,7 +693,7 @@ def cherry1_fwd(sbox):
cherry_pick(sbox, 8, 'A', 'B')
modify_branch(sbox, 'A', 10)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A6', 'A10'], # and NOT A8
expect_mi=[5, 6, 7, 9, 10],
expect_3ways=[three_way_merge('A4', 'A7'),
@@ -714,7 +714,7 @@ def cherry2_fwd(sbox):
cherry_pick(sbox, 8, 'B', 'A')
modify_branch(sbox, 'A', 10)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A10'], # and NOT A9
expect_mi=[5, 6, 7, 8, 9, 10],
expect_3ways=[three_way_merge('A9', 'A10')])
@@ -737,7 +737,7 @@ def cherry3_fwd(sbox):
modify_branch(sbox, 'B', 5)
modify_branch(sbox, 'B', 6)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A3'],
expect_mi=[2, 3, 4, 5, 6],
expect_3ways=[three_way_merge('A1', 'A6')])
@@ -745,13 +745,13 @@ def cherry3_fwd(sbox):
cherry_pick(sbox, 6, 'B', 'A')
modify_branch(sbox, 'A', 9)
- symmetric_merge(sbox, 'A', 'B',
+ automatic_merge(sbox, 'A', 'B',
expect_changes=['A9'], # and NOT A8
expect_mi=[7, 8, 9],
expect_3ways=[three_way_merge('A8', 'A9')])
#----------------------------------------------------------------------
-# Symmetric merges ignore subtree mergeinfo during reintegrate.
+# Automatic merges ignore subtree mergeinfo during reintegrate.
@SkipUnless(server_has_mergeinfo)
@XFail()
def subtree_to_and_fro(sbox):
@@ -786,32 +786,32 @@ def subtree_to_and_fro(sbox):
svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A/D', A_COPY_D_path)
svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
- '-m', 'Symmetric subtree merge')
+ '-m', 'Automatic subtree merge')
# r9 - Make an edit to A/D/H/psi.
svntest.main.file_write(psi_path, "Trunk Edit to 'psi'.\n")
svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
'-m', 'Edit a file on our trunk')
- # Now reintegrate ^/A_COPY back to A. To the symmetric merge code the
+ # Now reintegrate ^/A_COPY back to A. To the automatic merge code the
# subtree merge to A_COPY/D just looks like any other branch edit, it is
# not considered a merge. So the changes which exist on A/D and were
# merged to A_COPY/D, are merged *back* to A, resulting in a conflict:
#
# C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\
- # working_copies\merge_symmetric_tests-18>svn merge ^^/A_COPY A
+ # working_copies\merge_automatic_tests-18>svn merge ^^/A_COPY A
# DBG: merge.c:11461: base on source: file:///C:/SVN/src-trunk/Debug/
# subversion/tests/cmdline/svn-test-work/repositories/
- # merge_symmetric_tests-18/A@1
+ # merge_automatic_tests-18/A@1
# DBG: merge.c:11462: base on target: file:///C:/SVN/src-trunk/Debug/
# subversion/tests/cmdline/svn-test-work/repositories/
- # merge_symmetric_tests-18/A@1
+ # merge_automatic_tests-18/A@1
# DBG: merge.c:11567: yca file:///C:/SVN/src-trunk/Debug/subversion/
- # tests/cmdline/svn-test-work/repositories/merge_symmetric_tests-18/A@1
+ # tests/cmdline/svn-test-work/repositories/merge_automatic_tests-18/A@1
# DBG: merge.c:11568: base file:///C:/SVN/src-trunk/Debug/subversion/
- # tests/cmdline/svn-test-work/repositories/merge_symmetric_tests-18/A@1
+ # tests/cmdline/svn-test-work/repositories/merge_automatic_tests-18/A@1
# DBG: merge.c:11571: right file:///C:/SVN/src-trunk/Debug/subversion/
- # tests/cmdline/svn-test-work/repositories/merge_symmetric_tests-18/
+ # tests/cmdline/svn-test-work/repositories/merge_automatic_tests-18/
# A_COPY@8
# Conflict discovered in file 'A\D\H\psi'.
# Select: (p) postpone, (df) diff-full, (e) edit,
@@ -831,7 +831,7 @@ def subtree_to_and_fro(sbox):
# The 'old' merge produced a warning that reintegrate could not be used.
# Not claiming this is perfect, but it's better(?) than a conflict:
- svntest.verify.verify_outputs("Symmetric Reintegrate failed, but not "
+ svntest.verify.verify_outputs("Automatic Reintegrate failed, but not "
"in the way expected",
err, None,
"(svn: E195016: Reintegrate can only be used
if "
@@ -846,7 +846,7 @@ def subtree_to_and_fro(sbox):
True) # Match *all* lines of stdout
#----------------------------------------------------------------------
-# Symmetric merges ignore subtree mergeinfo gaps older than the last rev
+# Automatic merges ignore subtree mergeinfo gaps older than the last rev
# synced to the target root.
@SkipUnless(server_has_mergeinfo)
def merge_to_reverse_cherry_subtree_to_merge_to(sbox):
@@ -889,7 +889,7 @@ def merge_to_reverse_cherry_subtree_to_m
svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir, '-m',
'sync merge and reverse subtree merge')
- # Try a symmetric sync merge from ^/A to A_COPY. Revision 5 should be
+ # Try an automatic sync merge from ^/A to A_COPY. Revision 5 should be
# merged to A_COPY/B as its subtree mergeinfo reveals that rev is missing,
# like so:
#
