You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by iv...@apache.org on 2013/05/31 14:07:12 UTC

svn commit: r1488185 - /subversion/branches/1.8.x/STATUS

Author: ivan
Date: Fri May 31 12:07:12 2013
New Revision: 1488185

URL: http://svn.apache.org/r1488185
Log:
* STATUS: Nominate r1488183.

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=1488185&r1=1488184&r2=1488185&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri May 31 12:07:12 2013
@@ -49,6 +49,15 @@ Candidate changes:
      +1: mattiase (non-binding, not including r1485018)
      +1: breser, stefan2
 
+ * r1488183
+   Check target WC for mixed revisions, local modifications and switched
+   subtrees before contacting server for merge calculations.
+   Justification:
+     Merge calculations can easy take 10 seconds over WAN, while mixed
+     revisions working copy are common. Small fix.
+   Votes:
+     +1: ivan
+
 Veto-blocked changes:
 =====================