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 2014/03/13 14:22:25 UTC

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

Author: rhuijben
Date: Thu Mar 13 13:22:25 2014
New Revision: 1577153

URL: http://svn.apache.org/r1577153
Log:
* STATUS: Nominate r1577151

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=1577153&r1=1577152&r2=1577153&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Mar 13 13:22:25 2014
@@ -237,6 +237,15 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
+ * r1577151
+   Make 'svn merge' honor the 'preserved-conflict-file-exts' setting.
+   Justification:
+     While really a behavior change that doesn't belong in a patch release
+     I'm guessing nobody knew that we didn't implement this flag in this
+     scenario.
+   Votes:
+     +1: rhuijben
+
 Veto-blocked changes:
 =====================