You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2012/06/30 13:15:03 UTC
svn commit: r1355700 - in /subversion/branches/1.7.x: ./ STATUS
subversion/svn/main.c
Author: svn-role
Date: Sat Jun 30 11:15:02 2012
New Revision: 1355700
URL: http://svn.apache.org/viewvc?rev=1355700&view=rev
Log:
Merge r1349778 from trunk:
* r1349778
For issue #3962, fix example output of 'svn status' shown in 'svn
help status'.
Justification:
OCD.
Votes:
+1: cmpilato, gstein, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svn/main.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1349778
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1355700&r1=1355699&r2=1355700&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jun 30 11:15:02 2012
@@ -125,14 +125,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1349778
- For issue #3962, fix example output of 'svn status' shown in 'svn
- help status'.
- Justification:
- OCD.
- Votes:
- +1: cmpilato, gstein, rhuijben
-
* r1348822, r1349215
Fix "svn status -u --depth empty FILE"
Justification:
Modified: subversion/branches/1.7.x/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/main.c?rev=1355700&r1=1355699&r2=1355700&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/main.c (original)
+++ subversion/branches/1.7.x/subversion/svn/main.c Sat Jun 30 11:15:02 2012
@@ -1329,20 +1329,20 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" Example output:\n"
" svn status wc\n"
- " M wc/bar.c\n"
- " A + wc/qax.c\n"
+ " M wc/bar.c\n"
+ " A + wc/qax.c\n"
"\n"
" svn status -u wc\n"
- " M 965 wc/bar.c\n"
- " * 965 wc/foo.c\n"
- " A + - wc/qax.c\n"
+ " M 965 wc/bar.c\n"
+ " * 965 wc/foo.c\n"
+ " A + - wc/qax.c\n"
" Status against revision: 981\n"
"\n"
" svn status --show-updates --verbose wc\n"
- " M 965 938 kfogel wc/bar.c\n"
- " * 965 922 sussman wc/foo.c\n"
- " A + - 687 joe wc/qax.c\n"
- " 965 687 joe wc/zig.c\n"
+ " M 965 938 kfogel wc/bar.c\n"
+ " * 965 922 sussman wc/foo.c\n"
+ " A + - 687 joe wc/qax.c\n"
+ " 965 687 joe wc/zig.c\n"
" Status against revision: 981\n"
"\n"
" svn status\n"