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

Posted to commits@subversion.apache.org by ju...@apache.org on 2011/12/19 10:26:51 UTC

svn commit: r1220668 - /subversion/trunk/CHANGES

Author: julianfoad
Date: Mon Dec 19 09:26:51 2011
New Revision: 1220668

URL: http://svn.apache.org/viewvc?rev=1220668&view=rev
Log:
* CHANGES: Add r1215273 (reject some merges).

Modified:
    subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1220668&r1=1220667&r2=1220668&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Mon Dec 19 09:26:51 2011
@@ -13,6 +13,7 @@ http://svn.apache.org/repos/asf/subversi
     * new 'svnadmin load --revision' load filtering support (issue #3734)
     * new 'commit --include-externals' option (related to issues #1167, #3563)
     * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
+    * reject some attempts to merge between unrelated branches (r1215273)
 
   - Client-side bugfixes:
     *