Author: stsp
Date: Tue Apr 14 16:53:36 2015
New Revision: 1673466
URL: http://svn.apache.org/r1673466
Log:
* STATUS: The r1667228 group changes the conflict prompt menu, so move
it to the "must be in 1.9.0" section.
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=1673466&r1=1673465&r2=1673466&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Tue Apr 14 16:53:36 2015
@@ -69,6 +69,18 @@ Candidate changes that cannot go into a
Votes:
+1: stefan2
+ * r1667228, r1667234, r1667249, r1667250, 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:
+ rhuijben: This nomination contains some revisions that are also in
+ the r1667228 nomination. Perhaps these should be combined.
+ Votes:
+ +1: stsp
+
Other candidate changes:
========================
@@ -228,18 +240,6 @@ Other candidate changes:
Votes:
+1: rhuijben
- * r1667228, r1667234, r1667249, r1667250, 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:
- rhuijben: This nomination contains some revisions that are also in
- the r1667228 nomination. Perhaps these should be combined.
- Votes:
- +1: stsp
-
* r1673062
Fix 2 error leaks in the X.509 code.
Justification:
