Author: stefan2
Date: Sat Feb 14 09:30:51 2015
New Revision: 1659767
URL: http://svn.apache.org/r1659767
Log:
* STATUS: Vote for & approve r1658115 group.
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=1659767&r1=1659766&r2=1659767&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Feb 14 09:30:51 2015
@@ -140,14 +140,6 @@ Candidate changes:
+1: stefan2
+0: rhuijben (patch looks sane, but hard to oversee consequences)
- * r1658115, r1659553, r1659554
- Stop dropping a value when copying tree conflict information
- Justification:
- Trivial correctness fix that provides valueable information to the
- conflict resolver.
- Votes:
- +1: rhuijben, ivan
-
* r1658417
Don't ask a resolver if we should resolve if we only take no as answer
Justification:
@@ -219,3 +211,11 @@ Approved changes:
Votes:
+1: stsp, philip, stefan2
+ * r1658115, r1659553, r1659554
+ Stop dropping a value when copying tree conflict information
+ Justification:
+ Trivial correctness fix that provides valueable information to the
+ conflict resolver.
+ Votes:
+ +1: rhuijben, ivan, stefan2
+
