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 2018/07/29 14:11:03 UTC

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

Author: stsp
Date: Sun Jul 29 14:11:03 2018
New Revision: 1836978

URL: http://svn.apache.org/viewvc?rev=1836978&view=rev
Log:
* STATUS: Nominate 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=1836978&r1=1836977&r2=1836978&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Jul 29 14:11:03 2018
@@ -64,6 +64,15 @@ 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.
+   Notes:
+     To reproduce, undo r1836976 locally and run the test added in r1836977.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================