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 21:49:14 UTC

svn commit: r1482049 - /subversion/trunk/CHANGES

Author: stsp
Date: Mon May 13 19:49:14 2013
New Revision: 1482049

URL: http://svn.apache.org/r1482049
Log:
* CHANGES: Merge duplicate entries for 'automatic merge'.

Modified:
    subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1482049&r1=1482048&r2=1482049&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Mon May 13 19:49:14 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)
-    * new "automatic" merge makes --reintegrate unnecessary (r1369896, et al)
+    * merge uses reintegrate mode automatically when needed (r1369896 et al)
     * FSFS: Packing of revision property shards (issue #3944)
     * support inheritable properties (r1395109)
     * repository can suggest config for autoprops and ignores (r1401908)
@@ -72,7 +72,6 @@ http://svn.apache.org/repos/asf/subversi
     * 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745)
     * new '--drop-all-emtpy-revs' option for 'svndumpfilter' (issue #3681)
     * client version info now reported to commit hooks (issue #4124)
-    * 'svn merge' now uses reintegrate mode automatically when needed
     * 'svn' is now non-interactive when not run in a terminal device (r1424037)
     * 'svn propset' checks spelling of reserved property names.
     * improve working copy performance on network disks (issue #4176)