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/03/17 21:11:35 UTC

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

Author: rhuijben
Date: Tue Mar 17 20:11:35 2015
New Revision: 1667384

URL: http://svn.apache.org/r1667384
Log:
* STATUS: Nominate stsp's conflict resolver fixes and my related db optimizations.

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=1667384&r1=1667383&r2=1667384&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Tue Mar 17 20:11:35 2015
@@ -203,6 +203,16 @@ Other candidate changes:
    Votes:
      +0: julianfoad (reviewed, not tested)
 
+ * r1667228, r1667234, r1667228, r1667250, r1667258, r1667290
+   Improve binary file and property handling during conflict resolving
+   Justification:
+     Resolves a regression against 1.7 (and probably 1.8) where binary
+     files are not handled as such. The patch also contains some correctness
+     and performance fixes to avoid adding extra db operations on common
+     code paths.
+   Votes:
+     +1: rhuijben
+
 Veto-blocked changes:
 =====================