[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r1157246 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 18 Aug 2011 11:22:38 +0200

> -----Original Message-----
> From: stsp_at_apache.org [mailto:stsp_at_apache.org]
> Sent: vrijdag 12 augustus 2011 22:49
> To: commits_at_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
Received on 2011-08-18 11:23:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.