subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1577297 - /subversion/branches/1.8.x/STATUS
Date Thu, 13 Mar 2014 19:41:05 GMT
Author: breser
Date: Thu Mar 13 19:41:05 2014
New Revision: 1577297

URL: http://svn.apache.org/r1577297
Log:
* STATUS: Nominate r1577294.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1577297&r1=1577296&r2=1577297&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Mar 13 19:41:05 2014
@@ -246,6 +246,15 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
+ * r1577294
+   Make interactive conflict resolver behave as designed.
+   Justification:
+     This was intended to be the behavior form the start.  A typo in a
+     refactoring broke it.  This fix helps users avoid accidentally choosing
+     'mark resolved' and committing conflict markers.
+   Votes:
+     +1: breser
+
 Veto-blocked changes:
 =====================
 



Mime
View raw message