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

Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/16 13:42:12 UTC

svn commit: r1666981 - /subversion/branches/1.9.x/STATUS

Author: rhuijben
Date: Mon Mar 16 12:42:12 2015
New Revision: 1666981

URL: http://svn.apache.org/r1666981
Log:
* STATUS
  (r1666832): Nominate.

Suggested by: danielsh

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1666981&r1=1666980&r2=1666981&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Mon Mar 16 12:42:12 2015
@@ -197,6 +197,19 @@ Other candidate changes:
    Votes:
      +1: rhuijben
 
+ * r1666832
+   Resolve an assertion on a bad update report involving incomplete status
+   Justification:
+     The tree conflict detection logic in the update editor wasn't
+     designed to handle BASE adds, where the is an existing basenode. This
+     patch makes the update logic handling properly handle this bad state
+     for incomplete nodes, like it already does for status normal nodes.
+     .
+     Resolves a reproducable assertion in an restarted checkout against
+     github.
+   Votes:
+     +1: rhuijben
+
 Veto-blocked changes:
 =====================