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/07/08 15:20:55 UTC

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

Author: stefan2
Date: Mon Jul  8 13:20:55 2013
New Revision: 1500710

URL: http://svn.apache.org/r1500710
Log:
* STATUS: vote for & approve r1491816 group

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=1500710&r1=1500709&r2=1500710&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jul  8 13:20:55 2013
@@ -33,14 +33,6 @@ Candidate changes:
    Votes:
      +1: stsp, danielsh
 
- * r1491816, r1494089
-   Add two additional options to interactive file merge.
-   Justification:
-     Usability enhancement for quicker conflict resolution in some cases.
-     Very simple change. Only affects interactive mode, not scripts.
-   Votes:
-     +1: stsp, danielsh
-
  * r1491868, r1494657
    Add missing conflict callback invocations to the update editor.
    Justification:
@@ -279,3 +271,12 @@ Approved changes:
      Ev2 API, as that is what JavaHL exposes.
    Votes:
       +1: brane, gstein, stsp
+
+ * r1491816, r1494089
+   Add two additional options to interactive file merge.
+   Justification:
+     Usability enhancement for quicker conflict resolution in some cases.
+     Very simple change. Only affects interactive mode, not scripts.
+   Votes:
+     +1: stsp, danielsh, stefan2
+