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

Posted to commits@subversion.apache.org by st...@apache.org on 2013/07/02 21:18:02 UTC

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

Author: stsp
Date: Tue Jul  2 19:18:01 2013
New Revision: 1499065

URL: http://svn.apache.org/r1499065
Log:
* STATUS: Nominate r1499064.

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=1499065&r1=1499064&r2=1499065&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jul  2 19:18:01 2013
@@ -173,6 +173,14 @@ Candidate changes:
    Votes:
      +1: danielsh
 
+ * r1499064
+   Fix issue #4387, svn merge --record-only errors out on renamed path.
+   Justification:
+     Record-only merge shouldn't be flagging tree conflicts.
+     Regression from 1.7.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================