You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2012/03/15 12:02:32 UTC

svn propchange: r1300906 - svn:log

Author: julianfoad
Revision: 1300906
Modified property: svn:log

Modified: svn:log at Thu Mar 15 11:02:32 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Mar 15 11:02:32 2012
@@ -1,6 +1,6 @@
-Make the reintegrate merge APIs throw an error instead of an assertion
-failure if the target WC is a locally added node.  This was not triggered by
-the current 'svn' client but could be triggered by other clients.
+Make the reintegrate merge APIs throw an error instead of a seg-fault if the
+target WC is a locally added node.  This was not triggered by the current
+'svn' client but could be triggered by other clients.
 
 merge_tests.py 111 and 112 exercise the 'locally added node' code path in
 the function target_node_location().  I tested the new error code in the