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:53:27 UTC
svn commit: r929659 - /subversion/branches/1.6.x/CHANGES
Author: hwright
Date: Wed Mar 31 18:53:26 2010
New Revision: 929659
URL: http://svn.apache.org/viewvc?rev=929659&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=929659&r1=929658&r2=929659&view=diff
==============================================================================
--- subversion/branches/1.6.x/CHANGES (original)
+++ subversion/branches/1.6.x/CHANGES Wed Mar 31 18:53:26 2010
@@ -19,7 +19,7 @@ http://svn.apache.org/repos/asf/subversi
* 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: merge records mergeinfo from natural history gaps (issue #3432)
* fixed: theoretical possibility of DB corruption (r926151, -67)
Developer-visible changes:
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 31 18:53:26 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-929654
+/subversion/trunk/CHANGES:837701-841355,875962-929658