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

Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/11 18:35:35 UTC

svn commit: r1491870 - /subversion/branches/1.8.x/STATUS

Author: stsp
Date: Tue Jun 11 16:35:35 2013
New Revision: 1491870

URL: http://svn.apache.org/r1491870
Log:
* STATUS: Nominate r1491868, with Bert's +1 from the hackroom.

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=1491870&r1=1491869&r2=1491870&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jun 11 16:35:35 2013
@@ -123,6 +123,13 @@ Candidate changes:
     Votes:
       +1: stsp
 
+  * r1491868
+    Add missing conflict callback invocations to the update editor.
+    Justification:
+      Resolver is not invoked after some updates which flag new tree conflicts.
+    Votes:
+      +1: stsp, rhuijben
+
 Veto-blocked changes:
 =====================