You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2011/02/04 21:40:20 UTC

svn commit: r1067277 - /subversion/trunk/CHANGES

Author: pburba
Date: Fri Feb  4 20:40:20 2011
New Revision: 1067277

URL: http://svn.apache.org/viewvc?rev=1067277&view=rev
Log:
* CHANGES: Add some missing merge-tracking issues closed in 1.7.0.


Modified:
    subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1067277&r1=1067276&r2=1067277&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Fri Feb  4 20:40:20 2011
@@ -23,8 +23,10 @@ http://svn.apache.org/repos/asf/subversi
     * add '--ie' as an alias for '--ignore-externals' (issue #3436)
     * add 'svnlook filesize' (issue #3509)
     * add 'svnsync --disable-locking' (issue #3545)
+    * subtree merges don't unconditionally stop reintegrate merge (issue #3577)
     * 'svn --relocate' updates relative externals (issue #3597)
     * allow svnsync users to specify the source repo (issue #3637)
+    * remove redundant mergeinfo notifications for 2-URL merges (issue #3671)
     * 'svn export' into the current directory (issue #3727)
     * added '--parents' to 'svn update' (issue #3748)
 
@@ -63,15 +65,21 @@ http://svn.apache.org/repos/asf/subversi
     * fixed: case-only renames resulting from merges don't work (issue #3115)
     * fixed: 'svn mergeinfo' ignores peg rev for wc target (issue #3180)
     * fixed: unable to merge to wc of deleted branch (issue #3221)
+    * fixed: move via merge leaves behind versioned move source (issue #3324)
     * fixed: ra_serf does not honor http-proxy-exceptions (issue #3428)
     * fixed: 'svn mv A B; svn mv B A' loses history (issue #3429)
     * fixed: ra_serf doesn't support http-auth-types config (issue #3435)
+    * fixed: merge sets incorrect mergeinfo on skipped paths (issue #3440)
     * fixed: ra_serf inconsistent handling of cached authn creds (issue #3450)
     * fixed: excluded subtrees are not detected by svnversion (issue #3461)
     * fixed: submitting a changelist while obstructed item exists (issue #3484)
     * fixed: crash when changing an external's URL (issue #3530)
+    * fixed: target moved after branching breaks reintegrate (issue #3640)
     * fixed: potential race condition in svnsync (issue #3546)
+    * fixed: spurious merge conflicts with pre-1.7 mod_dav_svn (issue #3657)
     * fixed: repeat merge is not a no-op (issue #3564)
+    * fixed: inheritance results in self-referential mergeinfo (issue #3668)
+    * fixed: inheritance results in nonexistent mergeinfo sources (issue #3669)
     * fixed: memory leaks in ra_serf (issue #3684)
     * fixed: corruption of 'svn pg' output for large properties (issue #3721)
     * fixed: 'svnsync copy-revprops' doesn't sync revprop dels (issue #3728)
@@ -87,6 +95,7 @@ http://svn.apache.org/repos/asf/subversi
     * fixed: mod_dav_svn runs pre-revprop-change hook twice (issue #3085)
     * fixed: mod_dav_svn doesn't return stderr to user on failure (issue #3112)
     * fixed: hotcopy may corrupt target rep-cache.db (issue #3596)
+    * fixed: mod_dav_svn can cause spurious merge conflicts (issue #3657)
 
   - Other tool improvements and bugfixes:
     * svnsync now takes the '--config-option' argument (issue #2027)