subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1300647 - /subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
Date Wed, 14 Mar 2012 17:13:42 GMT
Author: philip
Date: Wed Mar 14 17:13:42 2012
New Revision: 1300647

URL: http://svn.apache.org/viewvc?rev=1300647&view=rev
Log:
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.

Modified:
    subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

Modified: subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c?rev=1300647&r1=1300646&r2=1300647&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c Wed Mar 14 17:13:42
2012
@@ -7522,15 +7522,6 @@ read_children_info(void *baton,
 
           /* 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));



Mime
View raw message