Author: brane
Date: Sun Jul 5 04:50:58 2015
New Revision: 1689213
URL: http://svn.apache.org/r1689213
Log:
* branches/1.9.x/STATUS: Approve the r1686175 group.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1689213&r1=1689212&r2=1689213&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Sun Jul 5 04:50:58 2015
@@ -32,6 +32,12 @@ Other candidate changes:
+1: rhuijben, ivan
+0.9: brane (The change looks trivially correct, but I can't test it)
+Veto-blocked changes:
+=====================
+
+Approved changes:
+=================
+
* r1686175, r1687029, r1688258
Fix part of issue #4582, "reintegrate complains about missing ranges
from node unrelated to branch"
@@ -39,11 +45,4 @@ Other candidate changes:
Reintegrate merge is impossible after the default conflict resolution
option is applied to a particular tree conflict during a sync merge.
Votes:
- +1: stsp, philip
- +1: brane (without r1688258)
-
-Veto-blocked changes:
-=====================
-
-Approved changes:
-=================
+ +1: stsp, philip, brane