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:18:56 UTC

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

Author: brane
Date: Mon Oct  1 10:18:56 2018
New Revision: 1842460

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

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=1842460&r1=1842459&r2=1842460&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Oct  1 10:18:56 2018
@@ -34,16 +34,6 @@ Candidate changes:
    Votes:
      +1: stsp
 
- * r1836976
-   Fix "relpath is canonical" assertion failure in conflict resolver.
-   Justification:
-     Assertion can be triggered by cherry-pick merge with a moved directory.
-     As copyfrom typically starts with a '/'
-   Notes:
-     To reproduce, undo r1836976 locally and run the test added in r1836977.
-   Votes:
-     +1: stsp, rhuijben
-
  * r1837790
    Make 'svnadmin verify --keep-going' always show an error summary. 
    Justification:
@@ -100,3 +90,13 @@ Approved changes:
      particular order. See commit message for details.
    Votes:
      +1: stsp, rhuijben, brane
+
+ * r1836976
+   Fix "relpath is canonical" assertion failure in conflict resolver.
+   Justification:
+     Assertion can be triggered by cherry-pick merge with a moved directory.
+     As copyfrom typically starts with a '/'
+   Notes:
+     To reproduce, undo r1836976 locally and run the test added in r1836977.
+   Votes:
+     +1: stsp, rhuijben, brane