You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/14 17:10:33 UTC
svn commit: r1666703 - /subversion/branches/1.8.x/STATUS
Author: rhuijben
Date: Sat Mar 14 16:10:33 2015
New Revision: 1666703
URL: http://svn.apache.org/r1666703
Log:
* STATUS: Nominate r1666690.
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=1666703&r1=1666702&r2=1666703&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Mar 14 16:10:33 2015
@@ -158,6 +158,16 @@ 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
+
Veto-blocked changes:
=====================