subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1667300 - /subversion/branches/1.8.x/STATUS
Date Tue, 17 Mar 2015 13:24:58 GMT
Author: philip
Date: Tue Mar 17 13:24:58 2015
New Revision: 1667300

URL: http://svn.apache.org/r1667300
Log:
* STATUS: Vote/approve skipped mergeinfo fix.

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=1667300&r1=1667299&r2=1667300&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Mar 17 13:24:58 2015
@@ -64,16 +64,6 @@ Candidate changes:
      +1: stefan2 (before r1660186 was added)
      +0: julianfoad
 
- * r1666690
-   Record skipped tree during merge on the skip root instead of leaves
-   Justification:
-     Resolves a user reported problem in merge handling. Avoids unnecessary
-     mergeinfo recording on multiple leaves when a single ancestor is shadowed.
-   Branch:
-     ^/subversion/branches/1.8.x-r1666690
-   Votes:
-     +1: rhuijben, brane
-
 Veto-blocked changes:
 =====================
 
@@ -151,3 +141,13 @@ Approved changes:
      leave dangling conflict markers in the old location. Easy fix.
    Votes:
      +1: stsp, brane, rhuijben
+
+ * r1666690
+   Record skipped tree during merge on the skip root instead of leaves
+   Justification:
+     Resolves a user reported problem in merge handling. Avoids unnecessary
+     mergeinfo recording on multiple leaves when a single ancestor is shadowed.
+   Branch:
+     ^/subversion/branches/1.8.x-r1666690
+   Votes:
+     +1: rhuijben, brane, philip



Mime
View raw message