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

Posted to commits@subversion.apache.org by pb...@apache.org on 2012/04/23 22:22:47 UTC

svn commit: r1329427 - /subversion/branches/1.7.x/STATUS

Author: pburba
Date: Mon Apr 23 20:22:47 2012
New Revision: 1329427

URL: http://svn.apache.org/viewvc?rev=1329427&view=rev
Log:
* STATUS: Nominate issue #4166 'multiple merge editor drives which add
  then delete a subtree fail' fix.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1329427&r1=1329426&r2=1329427&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Apr 23 20:22:47 2012
@@ -143,6 +143,14 @@ Candidate changes:
    Votes:
      +1: rhuijben, danielsh
 
+ * r1329417
+   Fix issue #4166 'multiple merge editor drives which add then delete a
+   subtree fail'.
+   Justification:
+     Prevents merge failure in an edge case.
+   Votes:
+     +1: pburba
+
 Veto-blocked changes:
 =====================