On multi-layer-move branch, remove an excessively strict check and allow a node to be both moved_to and moved_here. copy_tests 45 and 46 move a node and move it back and expect the result to be a replace; recording the moves for such a case seems reasonable. All regression tests now pass on the branch. * subversion/libsvn_wc/wc_db.c (read_children_info): Remove a check. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/multi-layer-moves@1300647 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_wc/wc_db.c b/subversion/libsvn_wc/wc_db.c index 134e58b..51f8c67 100644 --- a/subversion/libsvn_wc/wc_db.c +++ b/subversion/libsvn_wc/wc_db.c
@@ -7522,15 +7522,6 @@ /* Moved-here can only exist at op_depth > 0. */ child_item->info.moved_here = svn_sqlite__column_boolean(stmt, 20); - - /* Sanity check: A child is either moved-here, or moved-away. */ - if (child_item->info.moved_here && moved_to_relpath) - return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL, - _("The node '%s' has ambiguous move information"), - svn_dirent_local_style(svn_dirent_join(wcroot->abspath, - child_relpath, - scratch_pool), - scratch_pool)); } SVN_ERR(svn_sqlite__step(&have_row, stmt));