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 2013/06/10 14:46:56 UTC

svn commit: r1491439 - /subversion/branches/1.8.x/STATUS

Author: stsp
Date: Mon Jun 10 12:46:56 2013
New Revision: 1491439

URL: http://svn.apache.org/r1491439
Log:
* STATUS: Nominate r1491432 for 1.8.0.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1491439&r1=1491438&r2=1491439&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jun 10 12:46:56 2013
@@ -77,6 +77,19 @@ Candidate changes:
    Votes:
      +1: philip
 
+ * r1491432
+   Rename 'automatic merge' to 'complete merge' in the merge help text.
+   Justification:
+     Prevent user confusion. "Automatic merge" sounds too ambitious and
+     may be misunderstood if not used in context. The term 'complete'
+     refers to a merge which merges all outstanding changes from the
+     source branch, i.e. sync or reintegrate.
+   Notes:
+     This should be merged for 1.8.0, if possible, else different client
+     versions will name the feature in different ways.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================