You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/04/17 13:43:04 UTC
svn commit: r1674280 - /subversion/branches/1.9.x/STATUS
Author: brane
Date: Fri Apr 17 11:43:04 2015
New Revision: 1674280
URL: http://svn.apache.org/r1674280
Log:
* branches/1.9.x/STATUS: Approve the r1667228 group.
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=1674280&r1=1674279&r2=1674280&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Apr 17 11:43:04 2015
@@ -18,20 +18,6 @@ Release blockers for 1.9.0:
Candidate changes that cannot go into a later 1.9.x:
====================================================
- * r1667228, r1667234, r1667249, r1667250, r1667258, r1667290, r1667691, r1667692, r1667693
- Fix various problems with binary file conflicts.
- Justification:
- Conflict description API violates its own promises for binaries.
- Current behaviour can cause user confusion since conflict prompt
- options for binary files won't work as expected.
- Notes:
- r1667258, r1667290 resolve a performance regression introduced by the
- code which now needs the actual property values. It also avoids creating temporary
- files for property conflicts in cases where a caller can never use them.
- Votes:
- +1: rhuijben, stefan2
- +1: stsp (r1667228, r1667234, r1667249, r1667250, r1667691, r1667692, r1667693 only)
-
Other candidate changes:
========================
@@ -132,3 +118,17 @@ Approved changes:
Votes:
+1: rhuijben, philip, brane
+1: stefan2 (before branch)
+
+ * r1667228, r1667234, r1667249, r1667250, r1667258, r1667290, r1667691, r1667692, r1667693
+ Fix various problems with binary file conflicts.
+ Justification:
+ Conflict description API violates its own promises for binaries.
+ Current behaviour can cause user confusion since conflict prompt
+ options for binary files won't work as expected.
+ Notes:
+ r1667258, r1667290 resolve a performance regression introduced by the
+ code which now needs the actual property values. It also avoids creating temporary
+ files for property conflicts in cases where a caller can never use them.
+ Votes:
+ +1: rhuijben, stefan2, brane
+ +1: stsp (r1667228, r1667234, r1667249, r1667250, r1667691, r1667692, r1667693 only)