You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2014/03/24 16:05:21 UTC

svn commit: r1580874 - /subversion/branches/1.8.x/STATUS

Author: julianfoad
Date: Mon Mar 24 15:05:21 2014
New Revision: 1580874

URL: http://svn.apache.org/r1580874
Log:
* STATUS: Propose the fix for issue #4481 "automatic merge confused by missing
subtree merge".

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=1580874&r1=1580873&r2=1580874&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Mar 24 15:05:21 2014
@@ -287,6 +287,13 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
+ * r1580867, r1580872
+   Fix issue #4481 "automatic merge confused by missing subtree merge".
+   Justification:
+     Valid merges were broken (and gave a confusing error message).
+   Votes:
+     +1: julianfoad
+
 Veto-blocked changes:
 =====================