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 2019/03/13 13:41:54 UTC

svn commit: r1855423 - /subversion/branches/1.11.x/STATUS

Author: stsp
Date: Wed Mar 13 13:41:54 2019
New Revision: 1855423

URL: http://svn.apache.org/viewvc?rev=1855423&view=rev
Log:
* STATUS: Nominate r1855419.

Modified:
    subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1855423&r1=1855422&r2=1855423&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Mar 13 13:41:54 2019
@@ -87,6 +87,16 @@ Candidate changes:
    Votes:
      +1: brane, stsp
 
+ * r1855419
+   Fix conflict resolver bug where local and incoming edits got swapped.
+   Justification:
+     Bug breaks text conflict resolution.
+     User complained: https://svn.haxx.se/dev/archive-2019-03/0012.shtml
+   Branch:
+     ^/subversion/branches/1.11.x-r1855419
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================