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/01/23 14:14:51 UTC

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

Author: stsp
Date: Wed Jan 23 14:14:51 2019
New Revision: 1851922

URL: http://svn.apache.org/viewvc?rev=1851922&view=rev
Log:
* STATUS: Nominate r1851903 and r1851920.

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=1851922&r1=1851921&r2=1851922&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Wed Jan 23 14:14:51 2019
@@ -61,6 +61,20 @@ Candidate changes:
    Votes:
      +1: brane
 
+ * r1851903
+   Fix missing unlock of working copy in a resolver error case.
+   Justification:
+     Could force users to run 'svn cleanup' unnecessarily.
+   Votes:
+     +1: stsp
+
+ * r1851920
+   Remove a useless common ancestor search from the conflict resolver.
+   Justification:
+     Current behaviour is inefficient and could lead to dubious conflicts.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================