Author: svn-role
Date: Sat Nov 3 04:00:14 2018
New Revision: 1845637
URL: http://svn.apache.org/viewvc?rev=1845637&view=rev
Log:
Merge the r1842814 group from trunk:
* r1842814, r1842827, r1842829, r1842877
Improve 'svn help' for the 'add' command and for the '-N' option.
Justification:
Proper documentation was lacking. Another newbie was recently surprised
by how 'svn add' behaves relative to 'git add'.
Notes:
r1842814: Document the obsolete '-N' option properly.
r1842827: Fully document 'svn add', and include some newbie tips.
r1842829, r1842877: tweaks to formatting.
Votes:
+1: julianfoad, stsp, brane
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/svn/svn.c
subversion/branches/1.11.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 3 04:00:14 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842814,1842827,1842829,1842877
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1845637&r1=1845636&r2=1845637&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Sat Nov 3 04:00:14 2018
@@ -43,18 +43,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1842814, r1842827, r1842829, r1842877
- Improve 'svn help' for the 'add' command and for the '-N' option.
- Justification:
- Proper documentation was lacking. Another newbie was recently surprised
- by how 'svn add' behaves relative to 'git add'.
- Notes:
- r1842814: Document the obsolete '-N' option properly.
- r1842827: Fully document 'svn add', and include some newbie tips.
- r1842829, r1842877: tweaks to formatting.
- Votes:
- +1: julianfoad, stsp, brane
-
* r1842334
Update how we display the OS name on Mac in 'svn --version --verbose'.
Justification:
Modified: subversion/branches/1.11.x/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/svn/svn.c?rev=1845637&r1=1845636&r2=1845637&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.11.x/subversion/svn/svn.c Sat Nov 3 04:00:14 2018
@@ -165,7 +165,7 @@ const apr_getopt_option_t svn_cl__option
{"message", 'm', 1, N_("specify log message ARG")},
{"quiet", 'q', 0, N_("print nothing, or only summary information")},
{"recursive", 'R', 0, N_("descend recursively, same as
--depth=infinity")},
- {"non-recursive", 'N', 0, N_("obsolete; try --depth=files or
--depth=immediates")},
+ {"non-recursive", 'N', 0, N_("obsolete")},
{"change", 'c', 1,
N_("the change made by revision ARG (like -r ARG-1:ARG)\n"
" "
@@ -533,13 +533,34 @@ const int svn_cl__global_options[] =
const svn_opt_subcommand_desc3_t svn_cl__cmd_table[] =
{
{ "add", svn_cl__add, {0}, {N_(
- "Put files and directories under version control, scheduling\n"
- "them for addition to repository. They will be added in next commit.\n"
+ "Put new files and directories under version control.\n"
"usage: add PATH...\n"
+ "\n"), N_(
+ " Schedule unversioned PATHs for addition, so they will become versioned
and\n"
+ " be added to the repository in the next commit. Recurse into
directories by\n"
+ " default (see the --depth option).\n"
+ "\n"), N_(
+ " The 'svn add' command is only necessary for files and directories that
are\n"
+ " not yet under version control. Unversioned files and directories can
be\n"
+ " identified with 'svn status' (see 'svn help status').\n"
+ "\n"), N_(
+ " The effects of 'svn add' can be undone with 'svn revert' before the
addition\n"
+ " has been committed. Once committed, a path can be removed from
version\n"
+ " control with 'svn delete', and in some circumstances by running a
reverse-\n"
+ " merge (see 'svn help merge' for details).\n"
+ "\n"), N_(
+ " With --force, add all the unversioned paths found in PATHs and ignore
the\n"
+ " rest; otherwise, error out if any specified paths are already
versioned.\n"
+ "\n"), N_(
+ " The selection of items to add may be influenced by the 'ignores'
feature.\n"
+ " Properties may be attached to the items as configured by the
'auto-props'\n"
+ " feature.\n"
)},
{opt_targets, 'N', opt_depth, 'q', opt_force, opt_no_ignore, opt_autoprops,
opt_no_autoprops, opt_parents },
- {{opt_parents, N_("add intermediate parents")}} },
+ {{opt_parents, N_("add intermediate parents")},
+ {'N', N_("obsolete; same as --depth=empty")},
+ {opt_force, N_("ignore already versioned paths")}} },
{ "auth", svn_cl__auth, {0}, {N_(
"Manage cached authentication credentials.\n"
@@ -635,7 +656,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
" See also 'svn help update' for a list of possible characters\n"
" reporting the action taken.\n"
)},
- {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals} },
+ {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals},
+ {{'N', N_("obsolete; same as --depth=files")}} },
{ "cleanup", svn_cl__cleanup, {0}, {N_(
"Either recover from an interrupted operation that left the working copy
locked,\n"
@@ -684,7 +706,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
" fixed revision.\n"
)},
{'q', 'N', opt_depth, opt_targets, opt_no_unlock, SVN_CL__LOG_MSG_OPTIONS,
- opt_changelist, opt_keep_changelists, opt_include_externals} },
+ opt_changelist, opt_keep_changelists, opt_include_externals},
+ {{'N', N_("obsolete; same as --depth=empty")}} },
{ "copy", svn_cl__copy, {"cp"}, {N_(
"Copy files and directories in a working copy or repository.\n"
@@ -766,7 +789,9 @@ const svn_opt_subcommand_desc3_t svn_cl_
opt_internal_diff, 'x', opt_no_diff_added, opt_no_diff_deleted,
opt_ignore_properties, opt_properties_only,
opt_show_copies_as_adds, opt_notice_ancestry, opt_summarize,
opt_changelist,
- opt_force, opt_xml, opt_use_git_diff_format, opt_patch_compatible} },
+ opt_force, opt_xml, opt_use_git_diff_format, opt_patch_compatible},
+ {{'N', N_("obsolete; same as --depth=files")}} },
+
{ "export", svn_cl__export, {0}, {N_(
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -788,7 +813,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
" looked up.\n"
)},
{'r', 'q', 'N', opt_depth, opt_force, opt_native_eol, opt_ignore_externals,
- opt_ignore_keywords} },
+ opt_ignore_keywords},
+ {{'N', N_("obsolete; same as --depth=files")}} },
{ "help", svn_cl__help, {"?", "h"}, {N_(
"Describe the usage of this program or its subcommands.\n"
@@ -810,7 +836,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
" if --force is specified.\n"
)},
{'q', 'N', opt_depth, opt_autoprops, opt_force, opt_no_autoprops,
- SVN_CL__LOG_MSG_OPTIONS, opt_no_ignore} },
+ SVN_CL__LOG_MSG_OPTIONS, opt_no_ignore},
+ {{'N', N_("obsolete; same as --depth=files")}} },
{ "info", svn_cl__info, {0}, {N_(
"Display information about a local or remote item.\n"
@@ -1341,7 +1368,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
{'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, 'v'},
- { { opt_force, N_("force deletions even if deleted contents don't match")
} }
+ { { opt_force, N_("force deletions even if deleted contents don't match")
},
+ {'N', N_("obsolete; same as --depth=files")} }
},
{ "mergeinfo", svn_cl__mergeinfo, {0}, {N_(
@@ -1832,7 +1860,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
)},
{ 'u', 'v', 'N', opt_depth, 'r', 'q', opt_no_ignore, opt_incremental,
opt_xml, opt_ignore_externals, opt_changelist},
- {{'q', N_("don't print unversioned items")}} },
+ {{'q', N_("don't print unversioned items")},
+ {'N', N_("obsolete; same as --depth=immediates")}} },
{ "switch", svn_cl__switch, {"sw"}, {N_(
"Update the working copy to a different URL within the same repository.\n"
@@ -1882,7 +1911,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
N_("allow switching to a node with no common ancestor")},
{opt_force,
N_("handle unversioned obstructions as changes")},
- {opt_relocate,N_("deprecated; use 'svn relocate'")}}
+ {opt_relocate, N_("deprecated; use 'svn relocate'")},
+ {'N', N_("obsolete; same as --depth=files")}}
},
{ "unlock", svn_cl__unlock, {0}, {N_(
@@ -1945,7 +1975,8 @@ const svn_opt_subcommand_desc3_t svn_cl_
opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept,
opt_parents, opt_adds_as_modification},
{ {opt_force,
- N_("handle unversioned obstructions as changes")} } },
+ N_("handle unversioned obstructions as changes")},
+ {'N', N_("obsolete; same as --depth=files")} } },
{ "upgrade", svn_cl__upgrade, {0}, {N_(
"Upgrade the metadata storage format for a working copy.\n"
Modified:
subversion/branches/1.11.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1845637&r1=1845636&r2=1845637&view=diff
==============================================================================
---
subversion/branches/1.11.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++
subversion/branches/1.11.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Sat Nov 3 04:00:14 2018
@@ -209,7 +209,7 @@ Valid options:
'BASE' base rev of item's working copy
'COMMITTED' last commit at or before BASE
'PREV' revision just before COMMITTED
- -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates
+ -N [--non-recursive] : obsolete; same as --depth=files
--depth ARG : limit operation by depth ARG ('empty', 'files',
'immediates', or 'infinity')
--set-depth ARG : set new working copy depth to ARG ('exclude',
