You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/08/06 20:38:41 UTC
svn commit: r1369916 - in /subversion/trunk/subversion: svn/cl.h svn/main.c
tests/cmdline/merge_symmetric_tests.py
Author: julianfoad
Date: Mon Aug 6 18:38:40 2012
New Revision: 1369916
URL: http://svn.apache.org/viewvc?rev=1369916&view=rev
Log:
Remove the "--symmetric" command-line option, which was made redundant in
r1369896.
* subversion/svn/cl.h
(svn_cl__opt_state_t): Remove the 'symmetric_merge' member.
* subversion/svn/main.c
(svn_cl__longopt_t): Remove the 'opt_symmetric' member.
(sub_main): Remove handling of the '--symmetric' option.
* subversion/tests/cmdline/merge_symmetric_tests.py
(symmetric_merge, subtree_to_and_fro,
merge_to_reverse_cherry_subtree_to_merge_to): Remove the '--symmetric'
option from merge commands.
Modified:
subversion/trunk/subversion/svn/cl.h
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1369916&r1=1369915&r2=1369916&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Mon Aug 6 18:38:40 2012
@@ -203,7 +203,6 @@ typedef struct svn_cl__opt_state_t
const char *merge_cmd; /* the external merge command to use */
const char *editor_cmd; /* the external editor command to use */
svn_boolean_t record_only; /* whether to record mergeinfo */
- svn_boolean_t symmetric_merge; /* symmetric merge */
const char *old_target; /* diff target */
const char *new_target; /* diff target */
svn_boolean_t relocate; /* rewrite urls (svn switch) */
Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1369916&r1=1369915&r2=1369916&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Aug 6 18:38:40 2012
@@ -129,7 +129,6 @@ typedef enum svn_cl__longopt_t {
opt_diff,
opt_allow_mixed_revisions,
opt_include_externals,
- opt_symmetric,
opt_search,
opt_isearch,
} svn_cl__longopt_t;
@@ -375,8 +374,6 @@ const apr_getopt_option_t svn_cl__option
"recursion. This does not include externals with a\n"
" "
"fixed revision. (See the svn:externals property)")},
- {"symmetric", opt_symmetric, 0,
- N_("Symmetric merge")},
{"search", opt_search, 1,
N_("use ARG as search pattern (glob syntax)")},
@@ -1056,7 +1053,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" repositories.\n"),
{'r', 'c', 'N', opt_depth, 'q', opt_force, opt_dry_run, opt_merge_cmd,
opt_record_only, 'x', opt_ignore_ancestry, opt_accept, opt_reintegrate,
- opt_allow_mixed_revisions, opt_symmetric} },
+ opt_allow_mixed_revisions} },
{ "mergeinfo", svn_cl__mergeinfo, {0}, N_
("Display merge-related information.\n"
@@ -1984,9 +1981,6 @@ sub_main(int argc, const char *argv[], a
case opt_record_only:
opt_state.record_only = TRUE;
break;
- case opt_symmetric:
- opt_state.symmetric_merge = TRUE;
- break;
case opt_editor_cmd:
opt_state.editor_cmd = apr_pstrdup(pool, opt_arg);
break;
Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1369916&r1=1369915&r2=1369916&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Mon Aug 6 18:38:40 2012
@@ -301,7 +301,7 @@ def symmetric_merge(sbox, source, target
exp_out = expected_symmetric_merge_output(target, expect_3ways)
exit, out, err = svntest.actions.run_and_verify_svn(None, exp_out, [],
- 'merge', '--symmetric',
+ 'merge',
'^/' + source, target,
*args)
@@ -783,7 +783,7 @@ def subtree_to_and_fro(sbox):
# r8 - Do a subtree sync merge from ^/A/D to A_COPY/D.
# Note that among other things this changes A_COPY/D/H/psi.
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'merge', '--symmetric',
+ 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')
@@ -800,7 +800,6 @@ def subtree_to_and_fro(sbox):
#
# C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\
# working_copies\merge_symmetric_tests-18>svn merge ^^/A_COPY A
- # --symmetric
# 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
@@ -828,7 +827,7 @@ def subtree_to_and_fro(sbox):
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
exit_code, out, err = svntest.actions.run_and_verify_svn(
None, [], svntest.verify.AnyOutput,
- 'merge', '--symmetric', sbox.repo_url + '/A_COPY', A_path)
+ 'merge', sbox.repo_url + '/A_COPY', A_path)
# The 'old' merge produced a warning that reintegrate could not be used.
# Not claiming this is perfect, but it's better(?) than a conflict:
@@ -882,7 +881,7 @@ def merge_to_reverse_cherry_subtree_to_m
# svn:mergeinfo
# /A/B:2-4,6
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'merge', '--symmetric',
+ svntest.actions.run_and_verify_svn(None, None, [], 'merge',
sbox.repo_url + '/A', A_COPY_path)
svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c-5',
sbox.repo_url + '/A/B',
@@ -904,11 +903,11 @@ def merge_to_reverse_cherry_subtree_to_m
# --- Eliding mergeinfo from 'A_COPY\B':
# U A_COPY\B
#
- # But the --symmetric merge ignores the subtree mergeinfo and considers
+ # But the merge ignores the subtree mergeinfo and considers
# only the mergeinfo on the target itself (and thus is a no-op but for
# the mergeinfo change on the root of the merge target):
#
- # >svn merge ^/A A_COPY --symmetric
+ # >svn merge ^/A A_COPY
# --- Recording mergeinfo for merge of r7 into 'A_COPY':
# U A_COPY
#
@@ -986,7 +985,7 @@ def merge_to_reverse_cherry_subtree_to_m
expected_status,
expected_skip,
None, None, None, None,
- None, 1, 0, '--symmetric', A_COPY_path)
+ None, 1, 0, A_COPY_path)
########################################################################
# Run the tests