You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2022/03/17 21:23:22 UTC
svn commit: r1899007 - in /subversion/trunk: ./ subversion/svn/svn.c
Author: danielsh
Date: Thu Mar 17 21:23:22 2022
New Revision: 1899007
URL: http://svn.apache.org/viewvc?rev=1899007&view=rev
Log:
On trunk, cherry-pick r1898997 from the pristines-on-demand-on-mwf branch.
------------------------------------------------------------------------
r1898997 | danielsh | 2022-03-17 19:57:18 +0000 (Thu, 17 Mar 2022) | 7 lines
* subversion/svn/svn.c
(svn_cl__cmd_table_main."checkout",
svn_cl__cmd_table_main."upgrade"): Slightly rephrase to not imply that 1.8
is special in any way.
Review by: julianfoad
Thread: https://mail-archives.apache.org/mod_mbox/subversion-dev/202203.mbox/%3C00E57C09-0A19-4AFA-8E84-9DDD8D1A93FD%40getmailspring.com%3E
------------------------------------------------------------------------
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/svn/svn.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
Merged /subversion/branches/pristines-on-demand-on-mwf:r1898997
Modified: subversion/trunk/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1899007&r1=1899006&r2=1899007&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Thu Mar 17 21:23:22 2022
@@ -514,9 +514,9 @@ svn_cl__cmd_table_main[] =
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
"\n"), N_(
- " By default Subversion will create a WC format compatible with\n"
- " Subversion 1.8 and newer. To create a different WC format,\n"
- " use an option such as '--compatible-version=1.15'.\n"
+ " The new working copy (WC) will be compatible with Subversion 1.8 and\n"
+ " newer (this default may change in the future). To create a different\n"
+ " WC format, use an option such as '--compatible-version=1.15'.\n"
" The versions available are the same as in the 'upgrade' command.\n"
" Use 'svn --version' to see the compatible versions supported.\n"
"\n"), N_(
@@ -1915,8 +1915,8 @@ svn_cl__cmd_table_main[] =
"Upgrade the metadata storage format for a working copy.\n"
"usage: upgrade [WCPATH...]\n"
"\n"), N_(
- " By default Subversion will upgrade the working copy to a version\n"
- " compatible with Subversion 1.8 and newer. To upgrade to a different\n"
+ " The upgraded working copy will be compatible with Subversion 1.8 and\n"
+ " newer (this default may change in the future. To upgrade to a different\n"
" version, use an option such as '--compatible-version=1.15'.\n"
" The versions available are the same as in the 'checkout' command.\n"
" Use 'svn --version' to see the compatible versions supported.\n"