Author: stsp
Date: Mon Oct 25 15:42:03 2010
New Revision: 1027169
URL: http://svn.apache.org/viewvc?rev=1027169&view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Rename the --strip-count option to --strip, and
remove its alias (which was "--strip").
* subversion/tests/cmdline/patch_tests.py
(patch_strip1): Adjust accordingly.
Suggested by: julianfoad
Modified:
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/tests/cmdline/patch_tests.py
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1027169&r1=1027168&r2=1027169&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Oct 25 15:42:03 2010
@@ -304,18 +304,18 @@ const apr_getopt_option_t svn_cl__option
"('merged', 'eligible')")},
{"reintegrate", opt_reintegrate, 0,
N_("lump-merge all of source URL's unmerged changes")},
- {"strip-count", opt_strip_count, 1,
+ {"strip", opt_strip_count, 1,
N_("number of leading path components to strip from\n"
SVN_CL__OPTION_CONTINUATION_INDENT
- "paths parsed from the patch file. --strip-count 0\n"
+ "paths parsed from the patch file. --strip 0\n"
SVN_CL__OPTION_CONTINUATION_INDENT
"is the default and leaves paths unmodified.\n"
SVN_CL__OPTION_CONTINUATION_INDENT
- "--strip-count 1 would change the path\n"
+ "--strip 1 would change the path\n"
SVN_CL__OPTION_CONTINUATION_INDENT
"'doc/fudge/crunchy.html' to 'fudge/crunchy.html'.\n"
SVN_CL__OPTION_CONTINUATION_INDENT
- "--strip-count 2 would leave just 'crunchy.html'\n"
+ "--strip 2 would leave just 'crunchy.html'\n"
SVN_CL__OPTION_CONTINUATION_INDENT
"The expected component separator is '/' on all\n"
SVN_CL__OPTION_CONTINUATION_INDENT
@@ -371,7 +371,6 @@ const apr_getopt_option_t svn_cl__option
{"kl", opt_keep_local, 0, NULL},
{"sr", opt_show_revs, 1, NULL},
{"ri", opt_reintegrate, 0, NULL},
- {"strip", opt_strip_count, 1, NULL},
{"sca", opt_show_copies_as_adds, 0, NULL},
{"ik", opt_ignore_keywords, 0, NULL},
{"iw", opt_ignore_whitespace, 0, NULL},
Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1027169&r1=1027168&r2=1027169&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Mon Oct 25
15:42:03 2010
@@ -671,7 +671,7 @@ def patch_chopped_leading_spaces(sbox):
def patch_strip1(sbox):
- "patch with --strip-count 1"
+ "patch with --strip 1"
sbox.build()
wc_dir = sbox.wc_dir
@@ -838,7 +838,7 @@ def patch_strip1(sbox):
None, # expected err
1, # check-props
1, # dry-run
- '--strip-count', '1')
+ '--strip', '1')
def patch_no_index_line(sbox):
"patch with no index lines"
