Author: stefan2
Date: Wed Nov 19 17:35:56 2014
New Revision: 1640610
URL: http://svn.apache.org/r1640610
Log:
* STATUS: Approve r1620332.
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=1640610&r1=1640609&r2=1640610&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Nov 19 17:35:56 2014
@@ -110,15 +110,6 @@ Candidate changes:
Votes:
+1: julianfoad, rhuijben
- * r1620332
- Remove broken conflict resolver menu options.
- Justification:
- svn shouldn't offer menu options that always error out.
- Notes:
- Run merge with --accept theirs-conflict
- Votes:
- +1: stsp, julianfoad
-
* r1621978, r1621981
Fix changelist filtering for repos-WC and WC-WC diffs.
Justification:
@@ -207,4 +198,13 @@ Approved changes:
Votes:
+1: ivan, rhuijben, stefan2
+ * r1620332
+ Remove broken conflict resolver menu options.
+ Justification:
+ svn shouldn't offer menu options that always error out.
+ Notes:
+ Run merge with --accept theirs-conflict
+ Votes:
+ +1: stsp, julianfoad, stefan2
+
