Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1760576 - /subversion/branches/1.9.x/STATUS
Date: Tue, 13 Sep 2016 17:02:07 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20160913170207.6CBEB3A01DD@svn01-us-west.apache.org>
archived-at: Tue, 13 Sep 2016 17:02:11 -0000

Author: stsp
Date: Tue Sep 13 17:02:07 2016
New Revision: 1760576

URL: http://svn.apache.org/viewvc?rev=1760576&view=rev
Log:
* STATUS: Nominate r1734106 and r1760570.

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1760576&r1=1760575&r2=1760576&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Tue Sep 13 17:02:07 2016
@@ -119,6 +119,26 @@ Candidate changes:
    Votes:
      +1: stefan2
 
+ * r1734106
+   Fix a bug where the wrong source left revision was recorded in a tree
+   conflict.
+   Justification:
+     Conflict info recorded in WC should be correct.
+     Fix will help users who upgrade to 1.10 with conflicts recorded in WC.
+     Also, merging this allows r1760570 to merge cleanly.
+   Votes:
+     +1: stsp
+ 
+ * r1760570
+   Fix a spurious 'incoming edit' tree conflict with an unmodified file.
+   Justification:
+     Tree conflicts should not be raised unnecessarily.
+   Notes:
+     Depends on r1734106 to be merged first to avoid a text conflict
+     in the test suite code.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================