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/05/19 14:32:59 UTC

svn commit: r1680270 - /subversion/branches/1.9.x/STATUS

Author: rhuijben
Date: Tue May 19 12:32:59 2015
New Revision: 1680270

URL: http://svn.apache.org/r1680270
Log:
* STATUS: Nominate r1680242.

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=1680270&r1=1680269&r2=1680270&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Tue May 19 12:32:59 2015
@@ -42,6 +42,16 @@ Other candidate changes:
    Votes:
      +1: stefan2
 
+ * r1680242, r1680264
+   Stop removing last-change-* on non-updates of file externals (issue 4580)
+   Justification:
+     Resolves regression with 1.7.x/1.8.x pre 1.8.13, caused by issue 4411
+     patch. This patch implements this fix in a better way and also fixes
+     an incorrectly recorded url in text conflicts caused by updating a
+     file external.
+   Votes:
+     +1: rhuijben
+
 Veto-blocked changes:
 =====================