Author: rhuijben
Date: Sat Mar 14 15:44:26 2015
New Revision: 1666694
URL: http://svn.apache.org/r1666694
Log:
* STATUS: Nominate r1666690.
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=1666694&r1=1666693&r2=1666694&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Sat Mar 14 15:44:26 2015
@@ -168,6 +168,14 @@ Other candidate changes:
Votes:
+1: rhuijben, brane
+ * 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.
+ Votes:
+ +1: rhuijben
+
Veto-blocked changes:
=====================
