Author: julianfoad
Date: Fri Sep 21 08:13:43 2018
New Revision: 1841551
URL: http://svn.apache.org/viewvc?rev=1841551&view=rev
Log:
Merge r1841098 from trunk:
* r1841098
Rename --viewspec to --x-viewspec. See SVN-4776.
Justification:
Move experimental interfaces to a separate namespace.
Votes:
+1: danielsh, jamessan, julianfoad
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/STATUS
subversion/branches/1.11.x/subversion/svn/svn.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 21 08:13:43 2018
@@ -99,3 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
+/subversion/trunk:1841098
Modified: subversion/branches/1.11.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841551&r1=1841550&r2=1841551&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Sep 21 08:13:43 2018
@@ -59,13 +59,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1841098
- Rename --viewspec to --x-viewspec. See SVN-4776.
- Justification:
- Move experimental interfaces to a separate namespace.
- Votes:
- +1: danielsh, jamessan, julianfoad
-
* r1841272
'svn info --x-viewspec': Expose both output backends.
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=1841551&r1=1841550&r2=1841551&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.11.x/subversion/svn/svn.c Fri Sep 21 08:13:43 2018
@@ -480,7 +480,7 @@ const apr_getopt_option_t svn_cl__option
{"drop", opt_drop, 0,
N_("drop shelf after successful unshelve")},
- {"viewspec", opt_viewspec, 0,
+ {"x-viewspec", opt_viewspec, 0,
N_("print the working copy layout")},
/* Long-opt Aliases
@@ -823,7 +823,7 @@ const svn_opt_subcommand_desc3_t svn_cl_
" about TARGET.\n"
"\n"), N_(
" EXPERIMENTAL:\n"
- " With --viewspec, print the working copy layout.\n"
+ " With --x-viewspec, print the working copy layout.\n"
)},
{'r', 'R', opt_depth, opt_targets, opt_incremental, opt_xml,
opt_changelist, opt_include_externals, opt_show_item, opt_no_newline,
