Author: julianfoad
Date: Mon May 13 17:55:42 2013
New Revision: 1481994
URL: http://svn.apache.org/r1481994
Log:
* STATUS: Add a fix to the prop-conflict-node-kind group and remove my veto.
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=1481994&r1=1481993&r2=1481994&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon May 13 17:55:42 2013
@@ -122,10 +122,7 @@ Candidate changes:
Votes:
+1: mattiase (non-binding)
-Veto-blocked changes:
-=====================
-
- * r1477876, r1477891, r1478001
+ * r1477876, r1477891, r1478001, r1479605
Fix a bug whereby a property conflict description always reported
'unknown' for the node kind. Add a test which catches that bug.
Justification:
@@ -135,9 +132,13 @@ Veto-blocked changes:
The fix is in r1477876, and the branch was needed to resolve conflicts
(rather than porting prior changes on which it depended). The test is
in r1478001, and it depends on the test file changes made in r1477891.
+ r1479605 fixes an interactive conflict resolution bug triggered by this
+ change.
Votes:
- -1: julianfoad ('svn update' now crashes on interactive resolution of a
- prop conflict)
+ +1: julianfoad
+
+Veto-blocked changes:
+=====================
* r1469519, r1469520
Silence compiler warnings.
