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/01/12 19:42:44 UTC

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

Author: hwright
Date: Tue Jan 12 18:42:44 2010
New Revision: 898464

URL: http://svn.apache.org/viewvc?rev=898464&view=rev
Log:
* CHANGES:
  Bring up-to-date with 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=898464&r1=898463&r2=898464&view=diff
==============================================================================
--- subversion/branches/1.6.x/CHANGES (original)
+++ subversion/branches/1.6.x/CHANGES Tue Jan 12 18:42:44 2010
@@ -1,6 +1,6 @@
-Version 1.6.7
-(29 Dec 2009, from /branches/1.6.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.6.7
+Version 1.6.8
+(15 Jan 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.8
 
  User-visible changes:
   * allow multiple external updates over ra_svn (issue #3487)
@@ -15,9 +15,15 @@
   * teach mod_dav_svn to support the Label header (issue #3519)
   * fixed: svnsync leaves stale sync-locks on mirrors (r884842)
   * fix applicability of 'svn resolve --accept=theirs-conflict' (r880525, -6)
+  * fixed: segfault in 'svn resolve' (r896522, -47)
 
  Developer-visible changes:
   * update ruby bindings test expectation (r880162)
+  * don't allow rangelist and mergeinfo API to modify input args (r879093)
+
+
+Version 1.6.7
+(Not released, see changes for 1.6.8.)
 
 
 [ Note: All revision numbers for versions prior to 1.6.7 reference the

Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 12 18:42:44 2010
@@ -52,4 +52,4 @@
 /subversion/branches/tc_url_rev/CHANGES:870696-870828
 /subversion/branches/tree-conflicts/CHANGES:864636-869499
 /subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-893519,895514,895653,896522
+/subversion/trunk/CHANGES:875962-898462