You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2011/12/09 17:07:24 UTC

svn commit: r1212497 - /subversion/branches/1.7.x/STATUS

Author: stsp
Date: Fri Dec  9 16:07:24 2011
New Revision: 1212497

URL: http://svn.apache.org/viewvc?rev=1212497&view=rev
Log:
* STATUS: Nominate a huge bunch of merge help text improvements.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1212497&r1=1212496&r2=1212497&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Dec  9 16:07:24 2011
@@ -111,6 +111,19 @@ Candidate changes:
    Votes:
      +1: philip, rhuijben, steveking
 
+
+ * r1154121, r1195480, r1208840, r1209631, r1209654, r1212476, r1212482,
+   r1212484
+   Update and clarify the merge help text.
+   Justification:
+     Merge usage questions are very frequently asked questions in #svn IRC and
+     on the users@ list. We should improve the documentation whenever we can
+     and point people to it.
+   Notes:
+     Merge with --accept=theirs-conflict
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================