You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2009/12/04 15:49:47 UTC
svn commit: r887216 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/svn/main.c
subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Author: hwright
Date: Fri Dec 4 14:49:47 2009
New Revision: 887216
URL: http://svn.apache.org/viewvc?rev=887216&view=rev
Log:
Merge r886164, r886197 from trunk:
* r886164, r886197
Stop claiming in the 'svn update' and 'svn switch' usage messages that
--set-depth can't be used to make directories more shallow. It can.
Justification:
"Thou shalt not lie."
Votes:
+1: cmpilato, pburba, rhuijben
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/svn/main.c
subversion/branches/1.6.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 4 14:49:47 2009
@@ -1,5 +1,5 @@
/subversion/branches/1.6.x-future-proof:880259-884209
-/subversion/trunk:879688,880274-880275,880474,881905
+/subversion/trunk:879688,880274-880275,880474,881905,886164,886197
subversion/branches/1.5.x-r30215:870312
subversion/branches/1.6.x-UNC-paths:876471-876545
subversion/branches/1.6.x-dirent-basename:876130-876262
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 4 14:49:47 2009
@@ -1,5 +1,5 @@
/subversion/branches/1.6.x-future-proof/CHANGES:880259-884209
-/subversion/trunk/CHANGES:879688,880274-880275,880474,881905
+/subversion/trunk/CHANGES:879688,880274-880275,880474,881905,886164,886197
subversion/branches/1.5.x-r30215/CHANGES:870312
subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=887216&r1=887215&r2=887216&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Dec 4 14:49:47 2009
@@ -194,11 +194,3 @@
Approved changes:
=================
-
- * r886164, r886197
- Stop claiming in the 'svn update' and 'svn switch' usage messages that
- --set-depth can't be used to make directories more shallow. It can.
- Justification:
- "Thou shalt not lie."
- Votes:
- +1: cmpilato, pburba, rhuijben
Modified: subversion/branches/1.6.x/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/svn/main.c?rev=887216&r1=887215&r2=887216&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/svn/main.c (original)
+++ subversion/branches/1.6.x/subversion/svn/main.c Fri Dec 4 14:49:47 2009
@@ -927,9 +927,7 @@
" are applied to the obstructing path.\n"
"\n"
" Use the --set-depth option to set a new working copy depth on the\n"
- " targets of this operation. Currently, the depth of a working copy\n"
- " directory can only be increased (telescoped more deeply); you cannot\n"
- " make a directory more shallow.\n"
+ " targets of this operation.\n"
"\n"
" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
" This is used when repository's root URL changes (such as a scheme\n"
@@ -983,9 +981,7 @@
" in the first column with code 'E'.\n"
"\n"
" Use the --set-depth option to set a new working copy depth on the\n"
- " targets of this operation. Currently, the depth of a working copy\n"
- " directory can only be increased (telescoped more deeply); you cannot\n"
- " make a directory more shallow.\n"),
+ " targets of this operation.\n"),
{'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_force,
opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept} },
Modified: subversion/branches/1.6.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=887216&r1=887215&r2=887216&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ subversion/branches/1.6.x/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Fri Dec 4 14:49:47 2009
@@ -89,9 +89,7 @@
are applied to the obstructing path.
Use the --set-depth option to set a new working copy depth on the
- targets of this operation. Currently, the depth of a working copy
- directory can only be increased (telescoped more deeply); you cannot
- make a directory more shallow.
+ targets of this operation.
2. Rewrite working copy URL metadata to reflect a syntactic change only.
This is used when repository's root URL changes (such as a scheme