Author: julianfoad
Date: Wed May 1 14:07:19 2013
New Revision: 1478008
URL: http://svn.apache.org/r1478008
Log:
* STATUS: Update the r1477876 proposal, adding a backport branch and a test.
Modified:
subversion/branches/1.8.x-r1477876/STATUS
Modified: subversion/branches/1.8.x-r1477876/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1477876/STATUS?rev=1478008&r1=1478007&r2=1478008&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1477876/STATUS (original)
+++ subversion/branches/1.8.x-r1477876/STATUS Wed May 1 14:07:19 2013
@@ -66,11 +66,16 @@ Candidate changes:
+1: brane
+1: philip (for 1.8.0 only, not later 1.8.x)
- * r1477876
+ * r1477876, r1477891, r1478001
Fix a bug whereby a property conflict description always reported
- 'unknown' for the node kind.
+ 'unknown' for the node kind. Add a test which catches that bug.
Justification:
Regression from 1.7.
+ Branch: ^/subversion/branches/1.8.x-r1477876
+ Notes:
+ 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.
Votes:
+1: julianfoad
