You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/31 20:34:46 UTC

svn commit: r929655 - /subversion/branches/1.6.x/CHANGES

Author: hwright
Date: Wed Mar 31 18:34:46 2010
New Revision: 929655

URL: http://svn.apache.org/viewvc?rev=929655&view=rev
Log:
* CHANGES: Merge from trunk.

Modified:
    subversion/branches/1.6.x/CHANGES   (contents, props changed)

Modified: subversion/branches/1.6.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/CHANGES?rev=929655&r1=929654&r2=929655&view=diff
==============================================================================
--- subversion/branches/1.6.x/CHANGES (original)
+++ subversion/branches/1.6.x/CHANGES Wed Mar 31 18:34:46 2010
@@ -1,3 +1,34 @@
+Version 1.6.10
+(02 Apr 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.10
+
+ User-visible changes:
+  * fix for repositories mounted via NFS (issue #3501)
+  * enable TCP keep-alives in svnserve (r880552)
+  * tighten restrictions on revprops for 'svnadmin verify' (r904594)
+  * make ra_serf give better out-of-date information (issue #3561)
+  * improve error message upon connection failure with svn+ssh:// (r922516)
+  * allow 'svn log' on an uncommitted copy/move destination (r901752)
+  * make 'svnadmin hotcopy' copy the fsfs config file (r905303)
+  * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)
+  * make mergeinfo queries not require access to the repo root (issue #3242)
+  * update URLs to refer the the new apache.org repository (r904301, -94)
+  * update relative externals during a switch (issue #3390)
+  * fix 'merge --reintegrate' with self-referential mergeinfo (r892050, -85)
+  * improve wc-ng working copy detection (r929382)
+  * fixed: 'svnlook plist --revprop' with '-t TXN_NAME' (r917640, -8211)
+  * fixed: file external from URL cannot overwrite existing item (issue #3552)
+  * fixed: potential memory error in 'svn status' (r923674, -9)
+  * fixed: merge records merginfo from natural history gaps (issue #3432)
+  * fixed: theoretical possibility of DB corruption (r926151, -67)
+
+ Developer-visible changes:
+  * disable checks for wc-ng working copies when running the test suite
+  * on Windows, don't ignore move operation error codes (r896915)
+  * more precise reporting of errors occuring with sqlite init (r927323, -8)
+  * ensure rangelist APIs are commutative (r923389, -91)
+
+
 Version 1.6.9
 (25 Jan 2010, from /branches/1.6.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.6.9
@@ -38,7 +69,7 @@ Version 1.6.7
 
 Version 1.6.6
 (22 Oct 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.6
+http://svn.apache.org/repos/asf/subversion/tags/1.6.6
 
  User-visible changes:
   * fix crash during 'svn update' (r39673)
@@ -69,7 +100,7 @@ http://svn.collab.net/repos/svn/tags/1.6
 
 Version 1.6.5
 (22 Aug 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.5
+http://svn.apache.org/repos/asf/subversion/tags/1.6.5
 
  User-visible changes:
   * fix mod_dav_svn directory view links to preserve peg revisions (r38021)
@@ -97,17 +128,17 @@ http://svn.collab.net/repos/svn/tags/1.6
 
 Version 1.6.4
 (06 Aug 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.4
+http://svn.apache.org/repos/asf/subversion/tags/1.6.4
 
  User-visible changes:
   * fixed: heap overflow vulnerability on server and client
            See CVE-2009-2411, and descriptive advisory at
-           http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt
+           http://subversion.apache.org/security/CVE-2009-2411-advisory.txt
 
 
 Version 1.6.3
 (22 Jun 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.3
+http://svn.apache.org/repos/asf/subversion/tags/1.6.3
 
  User-visible changes:
   * fix segfault in WC->URL copy (r37646, -56)
@@ -144,7 +175,7 @@ http://svn.collab.net/repos/svn/tags/1.6
 
 Version 1.6.2
 (11 May 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.2
+http://svn.apache.org/repos/asf/subversion/tags/1.6.2
 
  User-visible changes:
   * vastly improve memory usage with 'svn merge' (issue #3393)
@@ -174,7 +205,7 @@ http://svn.collab.net/repos/svn/tags/1.6
 
 Version 1.6.1
 (9 Apr 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.1
+http://svn.apache.org/repos/asf/subversion/tags/1.6.1
 
  User-visible changes:
   * recommend Neon 0.28.4. (r36388)
@@ -216,7 +247,7 @@ http://svn.collab.net/repos/svn/tags/1.6
 
 Version 1.6.0
 (20 Mar 2009, from /branches/1.6.x)
-http://svn.collab.net/repos/svn/tags/1.6.0
+http://svn.apache.org/repos/asf/subversion/tags/1.6.0
 
  User-visible changes:
   - General:
@@ -320,17 +351,17 @@ http://svn.collab.net/repos/svn/tags/1.6
 
 Version 1.5.7
 (06 Aug 2009, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.7
+http://svn.apache.org/repos/asf/subversion/tags/1.5.7
 
  User-visible changes:
   * fixed: heap overflow vulnerability on server and client
            See CVE-2009-2411, and descriptive advisory at
-           http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt
+           http://subversion.apache.org/security/CVE-2009-2411-advisory.txt
 
 
 Version 1.5.6
 (26 Feb 2009, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.6
+http://svn.apache.org/repos/asf/subversion/tags/1.5.6
 
  User-visible changes:
   * allow colons within mergeinfo path names (r35040)
@@ -352,7 +383,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.5.5
 (22 Dec 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.5
+http://svn.apache.org/repos/asf/subversion/tags/1.5.5
 
  User-visible changes:
   * allow prop commits on dirs with modified children (r34487, -92, -94)
@@ -380,7 +411,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.5.4
 (24 Oct 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.4
+http://svn.apache.org/repos/asf/subversion/tags/1.5.4
 
  User-visible changes:
   * Properly handle explicit mergeinfo added in merge source (r32968, -75)
@@ -390,7 +421,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.5.3
 (10 Oct 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.3
+http://svn.apache.org/repos/asf/subversion/tags/1.5.3
 
  User-visible changes:
   * Allow switch to continue after deleting locally modified dirs (issue #2505)
@@ -417,7 +448,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.5.2
 (30 Aug 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.2
+http://svn.apache.org/repos/asf/subversion/tags/1.5.2
 
  User-visible changes:
   * Set correct permissions on created fsfs shards (r32355, -7)
@@ -448,7 +479,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.5.1
 (26 Jul 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.1
+http://svn.apache.org/repos/asf/subversion/tags/1.5.1
 
  User-visible changes:
   * mergeinfo on switched subtrees should elide in repos (issue #3188)
@@ -493,7 +524,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.5.0
 (19 Jun 2008, from /branches/1.5.x)
-http://svn.collab.net/repos/svn/tags/1.5.0
+http://svn.apache.org/repos/asf/subversion/tags/1.5.0
 
  User-visible changes:
   - Major new features:
@@ -711,7 +742,7 @@ http://svn.collab.net/repos/svn/tags/1.5
 
 Version 1.4.6
 (21 Dec 2007, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.6
+http://svn.apache.org/repos/asf/subversion/tags/1.4.6
 
  User-visible changes:
   - Client:
@@ -753,17 +784,17 @@ http://svn.collab.net/repos/svn/tags/1.4
 
 Version 1.4.5
 (27 Aug 2007, from /branches/1.4.5)
-http://svn.collab.net/repos/svn/tags/1.4.5
+http://svn.apache.org/repos/asf/subversion/tags/1.4.5
 
  User-visible changes:
  * fixed: file placement vulnerability (Win32 clients only)
           See CVE-2007-3846, and descriptive advisory at
-          http://subversion.tigris.org/security/CVE-2007-3846-advisory.txt
+          http://subversion.apache.org/security/CVE-2007-3846-advisory.txt
 
 
 Version 1.4.4
 (30 May 2007, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.4
+http://svn.apache.org/repos/asf/subversion/tags/1.4.4
 
  User-visible changes:
   - Client:
@@ -807,7 +838,7 @@ http://svn.collab.net/repos/svn/tags/1.4
 
 Version 1.4.3
 (18 January 2007, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.3
+http://svn.apache.org/repos/asf/subversion/tags/1.4.3
 
  User-visible changes:
   - Client:
@@ -844,7 +875,7 @@ http://svn.collab.net/repos/svn/tags/1.4
 
 Version 1.4.2
 (2 November 2006, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.2
+http://svn.apache.org/repos/asf/subversion/tags/1.4.2
 
  User-visible changes:
   - Client:
@@ -900,7 +931,7 @@ Version 1.4.1
 
 Version 1.4.0
 (10 September 2006, from /branches/1.4.x)
-http://svn.collab.net/repos/svn/tags/1.4.0
+http://svn.apache.org/repos/asf/subversion/tags/1.4.0
 
  User-visible changes:
   - Client:
@@ -1071,7 +1102,7 @@ http://svn.collab.net/repos/svn/tags/1.4
 
 Version 1.3.2
 (23 May 2006, from /branches/1.3.x)
-http://svn.collab.net/repos/svn/tags/1.3.2
+http://svn.apache.org/repos/asf/subversion/tags/1.3.2
 
  User-visible changes:
   - Client:
@@ -1103,7 +1134,7 @@ http://svn.collab.net/repos/svn/tags/1.3
 
 Version 1.3.1
 (25 March 2006, from /branches/1.3.x)
-http://svn.collab.net/repos/svn/tags/1.3.1
+http://svn.apache.org/repos/asf/subversion/tags/1.3.1
 
  User-visible changes:
   - Client:
@@ -1154,7 +1185,7 @@ http://svn.collab.net/repos/svn/tags/1.3
 
 Version 1.3.0
 (30 December 2005, from /branches/1.3.x)
-http://svn.collab.net/repos/svn/tags/1.3.0
+http://svn.apache.org/repos/asf/subversion/tags/1.3.0
 
  User-visible changes:
   - Client:
@@ -1255,7 +1286,7 @@ http://svn.collab.net/repos/svn/tags/1.3
 
 Version 1.2.3
 (19 August 2005, from /branches/1.2.x)
-http://svn.collab.net/repos/svn/tags/1.2.3
+http://svn.apache.org/repos/asf/subversion/tags/1.2.3
 
  User-visible changes:
   - Client:
@@ -1301,7 +1332,7 @@ Version 1.2.2
 
 Version 1.2.1
 (5 July 2005, from /branches/1.2.x)
-http://svn.collab.net/repos/svn/tags/1.2.1
+http://svn.apache.org/repos/asf/subversion/tags/1.2.1
 
  User-visible changes:
   - Client:
@@ -1334,10 +1365,10 @@ http://svn.collab.net/repos/svn/tags/1.2
 
 Version 1.2.0
 (21 May 2005, from /branches/1.2.x)
-http://svn.collab.net/repos/svn/tags/1.2.0
+http://svn.apache.org/repos/asf/subversion/tags/1.2.0
 
 See the 1.2 release notes for a more verbose overview of the changes since
-the 1.1 release:  http://subversion.tigris.org/svn_1.2_releasenotes.html
+the 1.1 release:  http://subversion.apache.org/docs/release-notes/1.2.html
 
  User-visible changes:
   - Client:
@@ -1483,7 +1514,7 @@ the 1.1 release:  http://subversion.tigr
 
 Version 1.1.4
 (1 April 2005, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.4
+http://svn.apache.org/repos/asf/subversion/tags/1.1.4
 
  User-visible changes:
   - Client:
@@ -1517,7 +1548,7 @@ http://svn.collab.net/repos/svn/tags/1.1
 
 Version 1.1.3
 (14 January 2005, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.3
+http://svn.apache.org/repos/asf/subversion/tags/1.1.3
 
  User-visible changes:
   - Client:
@@ -1529,7 +1560,7 @@ http://svn.collab.net/repos/svn/tags/1.1
  
 Version 1.1.2
 (20 December 2004, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.2
+http://svn.apache.org/repos/asf/subversion/tags/1.1.2
 
  User-visible changes:
   - Client:
@@ -1582,7 +1613,7 @@ http://svn.collab.net/repos/svn/tags/1.1
 
 Version 1.1.1
 (22 October 2004, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.1
+http://svn.apache.org/repos/asf/subversion/tags/1.1.1
 
  User-visible changes:
   - Client:
@@ -1617,7 +1648,7 @@ http://svn.collab.net/repos/svn/tags/1.1
 
 Version 1.0.9
 (13 October 2004, from /branches/1.0.9)
-http://svn.collab.net/repos/svn/tags/1.0.9
+http://svn.apache.org/repos/asf/subversion/tags/1.0.9
 
  User-visible changes:
   - Server:
@@ -1630,10 +1661,10 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.1.0
 (29 September 2004, from /branches/1.1.x)
-http://svn.collab.net/repos/svn/tags/1.1.0
+http://svn.apache.org/repos/asf/subversion/tags/1.1.0
 
 See the 1.1 release notes for a more verbose overview of the changes since
-1.0.x: http://subversion.tigris.org/svn_1.1_releasenotes.html
+1.0.x: http://subversion.apache.org/docs/release-notes/1.1.html
 
  User-visible changes:
  * new non-database repository back-end (libsvn_fs_fs)
@@ -1758,17 +1789,17 @@ See the 1.1 release notes for a more ver
 
 Version 1.0.8
 (22 September 2004, from /branches/1.0.8)
-http://svn.collab.net/repos/svn/tags/1.0.8
+http://svn.apache.org/repos/asf/subversion/tags/1.0.8
 
  User-visible changes:
  * fixed: mod_authz_svn path and log-message metadata leaks.
           See CAN-2004-0749, and descriptive advisory at 
-          http://subversion.tigris.org/security/CAN-2004-0749-advisory.txt
+          http://subversion.apache.org/security/CAN-2004-0749-advisory.txt
 
 
 Version 1.0.7
 (17 September 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.7
+http://svn.apache.org/repos/asf/subversion/tags/1.0.7
 
  User-visible changes:
  * fixed: win32 'file not found' error [issue #1862]
@@ -1787,7 +1818,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.6
 (19 July 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.6
+http://svn.apache.org/repos/asf/subversion/tags/1.0.6
 
  User-visible changes:
  * fixed: crash in status command, caused by race (r10144)
@@ -1801,7 +1832,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.5
 (10 Jun 2004, from /branches/1.0.5)
-http://svn.collab.net/repos/svn/tags/1.0.5
+http://svn.apache.org/repos/asf/subversion/tags/1.0.5
 
  User-visible changes:
  * fixed: security bug in svn protocol string parsing. (CAN-2004-0413)
@@ -1809,7 +1840,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.4
 (21 May 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.4
+http://svn.apache.org/repos/asf/subversion/tags/1.0.4
 
  User-visible changes:
  * fixed: 'svn up' can delete unversioned data on win32 fs (issue #1854)
@@ -1828,7 +1859,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.3
 (19 May 2004, from /branches/1.0.3)
-http://svn.collab.net/repos/svn/tags/1.0.3
+http://svn.apache.org/repos/asf/subversion/tags/1.0.3
 
  User-visible changes:
  * fixed: security bug in date parsing. (CAN-2004-0397)
@@ -1836,7 +1867,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.2
 (15 April 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.2
+http://svn.apache.org/repos/asf/subversion/tags/1.0.2
 
  User-visible changes:
  * fixed: segfault when remotely deleting svn:author property.
@@ -1861,7 +1892,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.1
 (12 March 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.1
+http://svn.apache.org/repos/asf/subversion/tags/1.0.1
 
  User-visible changes:
  * allow anonymous access checking in mod_authz_svn
@@ -1907,7 +1938,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 1.0.0
 (branching 23 February 2004, from /branches/1.0.x)
-http://svn.collab.net/repos/svn/tags/1.0.0
+http://svn.apache.org/repos/asf/subversion/tags/1.0.0
 
  User-visible changes:
  * fixes to the shbang lines in tools/hook-scripts/.
@@ -1931,7 +1962,7 @@ http://svn.collab.net/repos/svn/tags/1.0
 
 Version 0.37.0 [Beta Interim 2]
 (branching 24 January 2004, from /branches/1.0-stabilization)
-http://svn.collab.net/repos/svn/tags/0.37.0
+http://svn.apache.org/repos/asf/subversion/tags/0.37.0
 
  User-visible changes:
  * bugfix: buffer overflow for AIX client
@@ -1958,7 +1989,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 Version 0.36.0 [Beta Interim 1]
 (branching 13 January 2004, from /branches/1.0-stabilization)
-http://svn.collab.net/repos/svn/tags/0.36.0
+http://svn.apache.org/repos/asf/subversion/tags/0.36.0
 
  User-visible changes:
  * add cancellation support to svnadmin and svnlook (r8222)
@@ -1994,7 +2025,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.35.1 [Beta] (branching 19 December 2003, from /tags/0.35.0)
-http://svn.collab.net/repos/svn/tags/0.35.1
+http://svn.apache.org/repos/asf/subversion/tags/0.35.1
 
                               NOTICES:
 
@@ -2006,7 +2037,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.35.0 (branching 12 December 2003, from revision 7994)
-http://svn.collab.net/repos/svn/branches/0.35.0
+http://svn.apache.org/repos/asf/subversion/branches/0.35.0
 
                               NOTICES:
 
@@ -2039,7 +2070,7 @@ http://svn.collab.net/repos/svn/branches
 
 
 Version 0.34.0 (released 3 December 2003, from revision r7859)
-http://svn.collab.net/repos/svn/tags/0.34.0
+http://svn.apache.org/repos/asf/subversion/tags/0.34.0
 
 #####################################################################
 ##  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  ##
@@ -2061,7 +2092,7 @@ http://svn.collab.net/repos/svn/tags/0.3
  pre-0.34.0 repos to 0.34.0.
 
  That document is also located here:
-    http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO
+    http://svn.apache.org/repos/asf/subversion/trunk/notes/repos_upgrade_HOWTO
 
  User-visible changes:
  * fs schema change (#1578, #1595) **NOTE: repos dump/load cycle required!**
@@ -2084,7 +2115,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.33.1 (released 17 November 2003, revision r7782)
-http://svn.collab.net/repos/svn/tags/0.33.1
+http://svn.apache.org/repos/asf/subversion/tags/0.33.1
 
     NOTICE: This is a bugfix release.  The bug is fixed if *either*
             the client or server uses the new code.
@@ -2094,7 +2125,7 @@ User-visible changes:
 
 
 Version 0.33.0 (released 13 November 2003, revision r7737)
-http://svn.collab.net/repos/svn/tags/0.33.0
+http://svn.apache.org/repos/asf/subversion/tags/0.33.0
 
                               NOTICES:
 
@@ -2145,7 +2176,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.32.1 (released 23 October 2003, revision 7497)
-http://svn.collab.net/repos/svn/tags/0.32.1
+http://svn.apache.org/repos/asf/subversion/tags/0.32.1
 
  NOTICE: This release is to correct for the problems in the 0.32.0
          release.  There are no user or developer changes in this release
@@ -2156,7 +2187,7 @@ http://svn.collab.net/repos/svn/tags/0.3
          compatibility break with Subversions older than 0.28.0.
 
 Version 0.32.0 (released 22 October 2003, revision 7480)
-http://svn.collab.net/repos/svn/tags/0.32.0
+http://svn.apache.org/repos/asf/subversion/tags/0.32.0
 
  NOTICE: This release of Subversion causes an ra_dav client/server
          compatibility break with Subversions older than 0.28.0.
@@ -2190,7 +2221,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.31.0 (released 08 October 2003, revision 7355)
-http://svn.collab.net/repos/svn/tags/0.31.0
+http://svn.apache.org/repos/asf/subversion/tags/0.31.0
 
  User-visible changes:
  * new 'svnlook history' command (and removal of 'svnadmin lscr').
@@ -2231,7 +2262,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.30.0 (released 24 Sep 2003, revision 7178)
-http://svn.collab.net/repos/svn/tags/0.30.0
+http://svn.apache.org/repos/asf/subversion/tags/0.30.0
 
  User-visible changes:
  * SSL changes:  (r7134, #1330)
@@ -2266,7 +2297,7 @@ http://svn.collab.net/repos/svn/tags/0.3
 
 
 Version 0.29.0 (released 05 Sep 2003, revision 6976)
-http://svn.collab.net/repos/svn/tags/0.29.0
+http://svn.apache.org/repos/asf/subversion/tags/0.29.0
 
  User-visible changes:
  * 'svn status' now streams its response.  (r6913, #1426)
@@ -2294,7 +2325,7 @@ http://svn.collab.net/repos/svn/tags/0.2
 
 
 Version 0.28.2 (released 29 Aug 2003, revision 6946)
-http://svn.collab.net/repos/svn/tags/0.28.2
+http://svn.apache.org/repos/asf/subversion/tags/0.28.2
 
  User-visible changes:
  * MAJOR BUGFIX:  revert revision 6764.
@@ -2308,7 +2339,7 @@ http://svn.collab.net/repos/svn/tags/0.2
 
 
 Version 0.28.1
-(released 28 Aug 2003,http://svn.collab.net/repos/svn/tags/0.28.1)
+(released 28 Aug 2003,http://svn.apache.org/repos/asf/subversion/tags/0.28.1)
 
   There are no changes in this release.
   It is strictly an updated release, build with the correct version
@@ -2316,7 +2347,7 @@ Version 0.28.1
 
 
 Version 0.28.0 (released 27 August 2003, rev 6894, branches/release-0.28)
-(http://svn.collab.net/repos/svn/tags/0.28)
+(http://svn.apache.org/repos/asf/subversion/tags/0.28)
 
 #####################################################################
 ##  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  WARNING  ##
@@ -2339,7 +2370,7 @@ Version 0.28.0 (released 27 August 2003,
  pre-0.28.0 repos to 0.28.0.
 
  That document is also located here:
-    http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO
+    http://svn.apache.org/repos/asf/subversion/trunk/notes/repos_upgrade_HOWTO
 
  User-visible changes:
  * fs schema change, see issue #1003 **NOTE: repos dump/load cycle required!**
@@ -3135,7 +3166,7 @@ Version 0.13.0 [Pre-Alpha] (released 10 
  User-visible changes:
  * repositories have a new database schema;  existing ones must be upgraded!
     - new svnadmin 'dump'/'load' commands to migrate repositories
-    - read http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO
+    - read http://svn.apache.org/repos/asf/subversion/trunk/notes/repos_upgrade_HOWTO
 
  Developer-visible changes:
  * complete rewrite of filesystem schema!

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 18:34:46 2010
@@ -67,4 +67,4 @@
 /subversion/branches/tc_url_rev/CHANGES:874351-874483
 /subversion/branches/tree-conflicts/CHANGES:868291-873154
 /subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-901365,901752,904301,904394,904594,905303,905326,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328
+/subversion/trunk/CHANGES:837701-841355,875962-929654