Author: brane
Date: Fri Jul 3 03:09:40 2015
New Revision: 1688941
URL: http://svn.apache.org/r1688941
Log:
* branches/1.9.x/STATUS: Vote for 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=1688941&r1=1688940&r2=1688941&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Jul 3 03:09:40 2015
@@ -32,14 +32,14 @@ Other candidate changes:
+1: rhuijben, ivan
+0.9: brane (The change looks trivially correct, but I can't test it)
- * 1686175, r1687029
+ * r1686175, r1687029
Fix issue #4285, "reintegrate complains about missing ranges from node
unrelated to branch"
Justification:
Reintegrate merge is impossible after the default conflict resolution
option is applied to a particular tree conflict during a sync merge.
Votes:
- +1: stsp
+ +1: stsp, brane
Veto-blocked changes:
=====================
