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

Posted to commits@subversion.apache.org by st...@apache.org on 2013/05/13 17:26:17 UTC

svn commit: r1481917 - /subversion/trunk/CHANGES

Author: stsp
Date: Mon May 13 15:26:17 2013
New Revision: 1481917

URL: http://svn.apache.org/r1481917
Log:
* CHANGES: Add revnum to automatic merge entry, and quote "automatic" to avoid
   people misinterpreting what we mean.

Modified:
    subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1481917&r1=1481916&r2=1481917&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Mon May 13 15:26:17 2013
@@ -34,7 +34,7 @@ http://svn.apache.org/repos/asf/subversi
 
   - Major new features:
     * working copy records moves as first-class operation (issue #3631, #4232)
-    * automatic merge makes --reintegrate option unneccessary
+    * new "automatic" merge makes --reintegrate option unneccessary (r1369896)
     * FSFS: Packing of revision property shards (issue #3944)
     * support inheritable properties (r1395109)
     * repository can suggest config for autoprops and ignores (r1401908)