You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/05/01 16:22:03 UTC

svn commit: r1478016 - in /subversion/branches/1.8.x: ./ STATUS

Author: julianfoad
Date: Wed May  1 14:22:03 2013
New Revision: 1478016

URL: http://svn.apache.org/r1478016
Log:
* STATUS: Update the r1477876 proposal, adding a backport branch and a test.
  (Done by merging such a change from the 1.8.x-r1477876 backport branch,
  because I accidentally committed this update to that branch initially.)

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/branches/1.8.x-r1477876:r1477981-1478008

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1478016&r1=1478015&r2=1478016&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May  1 14:22:03 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