You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/06/26 16:05:29 UTC
svn commit: r1496940 - /subversion/branches/1.8.x/STATUS

Author: julianfoad
Date: Wed Jun 26 14:05:28 2013
New Revision: 1496940

URL: http://svn.apache.org/r1496940
Log:
* STATUS: Vote for and approve r1491432 (automatic

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=1496940&r1=1496939&r2=1496940&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 26 14:05:28 2013
@@ -37,21 +37,6 @@ Candidate changes:
    Votes:
      +0: rhuijben (Needs more work. Breaks JavaHL)
 
- * 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
-     +1: danielsh (no opinion on the name of the feature; just confirming this
-                   patch does what it claims to)
-
  * r1491739, r1491755, r1491762, r1492152, r1492670, r1492682
    Improve interactive conflict resolution menu.
    Justification:
@@ -159,3 +144,20 @@ Veto-blocked changes:
 Approved changes:
 =================
 
+ * r1491432, r1496938
+   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 was not merged in time for 1.8.0, so different client
+     versions will name the feature in different ways.
+     r1496938 just tweaks "an 'complete' merge" to "a 'complete' merge".
+   Votes:
+     +1: stsp
+     +1: danielsh (no opinion on the name of the feature; just confirming this
+                   patch does what it claims to)
+     +1: julianfoad
+