> -----Original Message----- > From: s...@apache.org [mailto:s...@apache.org] > Sent: vrijdag 12 augustus 2011 22:49 > To: comm...@subversion.apache.org > Subject: svn commit: r1157246 - in /subversion/trunk/subversion/libsvn_wc: > wc-queries.sql wc_db.c > > Author: stsp > Date: Fri Aug 12 20:49:09 2011 > New Revision: 1157246
Reviewing an old patch. > > URL: http://svn.apache.org/viewvc?rev=1157246&view=rev > Log: > When reverting one half of a move, transform the other half into a > plain addition/copy. > > * subversion/libsvn_wc/wc-queries.sql > (STMT_SELECT_NODE_INFO): Return the moved_here column. > (STMT_SELECT_NODE_INFO_WITH_LOCK): Same here, just for consistency. > > * subversion/libsvn_wc/wc_db.c > (clear_moved_to): New helper for op_revert_txn and > op_revert_recursive_txn. > (op_revert_txn, op_revert_recursive_txn): Clear the moved-to relpath at > the delete-half of a move for any reverted moved-here node. This doesn't look right. STMT_SELECT_NODE_INFO and STMT_SELECT_NODE_INFO_WITH_LOCK have exactly the same data in the same column numbers, yet the users of STMT_SELECT_NODE_INFO_WITH_LOCK (read: read_info and read_info_children) weren't updated. The new column that was queried should be at the same position in both queries and the offset of the lock data updated. Bert
