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 2013/06/30 06:01:07 UTC
svn commit: r1498060 - in /subversion/branches/1.8.x: ./ STATUS
subversion/svn/svn.c
Author: svn-role
Date: Sun Jun 30 04:01:07 2013
New Revision: 1498060
URL: http://svn.apache.org/r1498060
Log:
Merge r1497318 from trunk:
* r1497318
Better explain working copy locks in 'svn help status' output.
Justification:
The current documentation can be misleading for users who might
not know what the purpose of the lock is.
Votes:
+1: stsp, brane, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svn/svn.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1497318
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1498060&r1=1498059&r2=1498060&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sun Jun 30 04:01:07 2013
@@ -165,14 +165,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1497318
- Better explain working copy locks in 'svn help status' output.
- Justification:
- The current documentation can be misleading for users who might
- not know what the purpose of the lock is.
- Votes:
- +1: stsp, brane, stefan2
-
* r1497319
Better explain exclusive-commit locks in 'svn help status' output.
Justification:
Modified: subversion/branches/1.8.x/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/svn.c?rev=1498060&r1=1498059&r2=1498060&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.8.x/subversion/svn/svn.c Sun Jun 30 04:01:07 2013
@@ -1430,9 +1430,10 @@ const svn_opt_subcommand_desc2_t svn_cl_
" ' ' no modifications\n"
" 'C' Conflicted\n"
" 'M' Modified\n"
- " Third column: Whether the working copy directory is locked\n"
- " ' ' not locked\n"
- " 'L' locked\n"
+ " Third column: Whether the working copy is locked for writing by\n"
+ " another Subversion client modifying the working copy\n"
+ " ' ' not locked for writing\n"
+ " 'L' locked for writing\n"
" Fourth column: Scheduled commit will contain addition-with-history\n"
" ' ' no history scheduled with commit\n"
" '+' history scheduled with commit\n"