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

Posted to commits@subversion.apache.org by br...@apache.org on 2018/10/01 10:23:43 UTC

svn commit: r1842461 - /subversion/branches/1.10.x/STATUS

Author: brane
Date: Mon Oct  1 10:23:43 2018
New Revision: 1842461

URL: http://svn.apache.org/viewvc?rev=1842461&view=rev
Log:
* branches/1.10.x/STATUS: Approve r1836963.

Modified:
    subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1842461&r1=1842460&r2=1842461&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Oct  1 10:23:43 2018
@@ -15,14 +15,6 @@ Status of 1.10.3:
 Candidate changes:
 ==================
 
- * r1836963
-   Fix potential NULL deref in conflict resolver.
-   Justification:
-     Real-world impact unknown. Found during code inspection.
-     Let us better be safe than sorry.
-   Votes:
-     +1: stsp, rhuijben
-
  * r1836960, r1836968
    Fix issue #4766, "resolver adds unrelated moves to move target list"
    Justification:
@@ -100,3 +92,11 @@ Approved changes:
      To reproduce, undo r1836976 locally and run the test added in r1836977.
    Votes:
      +1: stsp, rhuijben, brane
+
+ * r1836963
+   Fix potential NULL deref in conflict resolver.
+   Justification:
+     Real-world impact unknown. Found during code inspection.
+     Let us better be safe than sorry.
+   Votes:
+     +1: stsp, rhuijben, brane