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 2010/11/24 13:49:01 UTC
svn commit: r1038589 - /subversion/branches/1.6.x/CHANGES
Author: stsp
Date: Wed Nov 24 12:49:01 2010
New Revision: 1038589
URL: http://svn.apache.org/viewvc?rev=1038589&view=rev
Log:
* CHANGES (for 1.6.x): Merge outstanding changes 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=1038589&r1=1038588&r2=1038589&view=diff
==============================================================================
--- subversion/branches/1.6.x/CHANGES (original)
+++ subversion/branches/1.6.x/CHANGES Wed Nov 24 12:49:01 2010
@@ -3,7 +3,6 @@ Version 1.6.15
http://svn.apache.org/repos/asf/subversion/tags/1.6.15
User-visible changes:
- * improve svnsync handling of dir copies (r962377, -8)
* hide unreadable dirs in mod_dav_svn's GET response (r996884)
* make 'svnmucc propsetf' actually work (r1005446)
* limit memory fragmentation in svnserve (r1022675)
@@ -444,6 +443,32 @@ http://svn.apache.org/repos/asf/subversi
* fix building Ruby bindings with Ruby 1.9 (r35852, r35883)
+Version 1.5.8
+(?? ??? 2010, from /branches/1.5.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.5.8
+
+ User-visible changes:
+ * fix proxying of LOCK and UNLOCK requests with WebDAV proxies (r36159)
+ * improve performance of --ignore-ancestry merges (r36256)
+ * avoid crash with when using subtree mergeinfo (r36613, -13, -31, -41)
+ * improve merge correctness with non-inheritable mergeinfo (r36789)
+ * fixed: repeated mergeinfo of conflicting properties fails (issue #3250)
+ * fix segfault in wc->URL copy (r37646, -56)
+ * make 'svn up --set-depth infinity' expand shallow subtrees (r37169)
+ * make default depth of 'svn merge' infinity (r37156)
+ * error if attempting to reintegrate to/from the repo root (r37385)
+ * improve memory performance in 'svn merge' (issue #3393)
+ * fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695)
+ See CVE-2010-3315, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2010-3315-advisory.txt
+ * prevent crash in mod_dav_svn when using SVNParentPath (r1033166)
+
+ Developer-visible changes:
+ * fix pointer dereference (r36783)
+ * fix error leak (r36860)
+ * make basic_tests 12 compatible with Windows and Python 2.5+ (r35930)
+
+
Version 1.5.7
(06 Aug 2009, from /branches/1.5.x)
http://svn.apache.org/repos/asf/subversion/tags/1.5.7
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 24 12:49:01 2010
@@ -98,4 +98,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-1038134
+/subversion/trunk/CHANGES:837701-841355,875962-1038588