Author: julianfoad
Date: Fri Apr 11 15:51:15 2014
New Revision: 1586699
URL: http://svn.apache.org/r1586699
Log:
* STATUS: Vote for r1577294: Make interactive conflict resolver behave as
designed.
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=1586699&r1=1586698&r2=1586699&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 11 15:51:15 2014
@@ -201,15 +201,6 @@ Candidate changes:
Votes:
+1: rhuijben
- * r1577294
- Make interactive conflict resolver behave as designed.
- Justification:
- This was intended to be the behavior form the start. A typo in a
- refactoring broke it. This fix helps users avoid accidentally choosing
- 'mark resolved' and committing conflict markers.
- Votes:
- +1: breser, ivan
-
* r1577812, r1577813, r1579429
Resolve a segfault when 'svn merge --force' merges a directory delete
Justification:
@@ -369,6 +360,15 @@ Veto-blocked changes:
Approved changes:
=================
+ * r1577294
+ Make interactive conflict resolver behave as designed.
+ Justification:
+ This was intended to be the behavior form the start. A typo in a
+ refactoring broke it. This fix helps users avoid accidentally choosing
+ 'mark resolved' and committing conflict markers.
+ Votes:
+ +1: breser, ivan, julianfoad
+
* r1578670, r1578820, r1579274
Fix the order of node record headers written by svndumpfilter.
Justification:
