subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1853486 - /subversion/branches/1.10.x/STATUS
Date Wed, 13 Feb 2019 10:45:22 GMT
Author: stsp
Date: Wed Feb 13 10:45:22 2019
New Revision: 1853486

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

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=1853486&r1=1853485&r2=1853486&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Wed Feb 13 10:45:22 2019
@@ -80,6 +80,13 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * r1853450
+   Enable 'incoming_move_file_merge' option only if local change is file edit.
+   Justification:
+     Conflict resolver misbehaves when it runs into move vs move conflicts.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================
 



Mime
View raw message