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 2011/07/29 19:48:18 UTC
svn commit: r1152326 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: stsp
Date: Fri Jul 29 17:48:18 2011
New Revision: 1152326
URL: http://svn.apache.org/viewvc?rev=1152326&view=rev
Log:
Restore r1152294 (which see for full log message) unchanged.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1152326&r1=1152325&r2=1152326&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jul 29 17:48:18 2011
@@ -6136,6 +6136,15 @@ op_delete_txn(void *baton,
&child_delete_op_root_relpath,
wcroot, moved_here_child_relpath,
iterpool, iterpool));
+#if SVN_DEBUG
+ /* This catches incorrectly recorded moves.
+ * It is possible to hit this during normal operation
+ * if a move was interrupted mid-way so only perform
+ * this check in debug mode. */
+ SVN_ERR_ASSERT(moved_from_relpath &&
+ !strcmp(child_moved_from_relpath,
+ svn_sqlite__column_text(stmt, 1, NULL)));
+#endif
if (child_status == svn_wc__db_status_moved_here)
{
const char *child_subtree_relpath;