subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1471512 - /subversion/branches/1.8.x/STATUS
Date Wed, 24 Apr 2013 16:33:05 GMT
Author: julianfoad
Date: Wed Apr 24 16:33:04 2013
New Revision: 1471512

URL: http://svn.apache.org/r1471512
Log:
* STATUS: Nominate r1471490.

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=1471512&r1=1471511&r2=1471512&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Apr 24 16:33:04 2013
@@ -99,6 +99,19 @@ Candidate changes:
    Votes:
      +1: philip, rhuijben
 
+ * r1471443, r1471490
+   Fix a bug in the Summary of Conflicts when using interactive conflict
+     resolution.  Marking a text conflict as resolved but leaving a prop
+     conflict unresolved on the same file, or vice versa, would decrement
+     both the text and prop conflict summary stats.
+   Justification:
+     Regression since 1.7.
+   Notes:
+     r1471443 is just a removal of unused code, and is included here in
+     order to avoid conflicts.  r1471490 is the main change.
+   Votes:
+     +1: julianfoad
+
 Veto-blocked changes:
 =====================
 



Mime
View raw message