Checkout
Philip Martin
committed
on 27 May 11
Fix issue 3859 by extending the revert list table to allow
both an ACTUAL_NODE and a NODES row to be recorded.

* subversion/libsvn_wc/wc-qu… Show more
Fix issue 3859 by extending the revert list table to allow

both an ACTUAL_NODE and a NODES row to be recorded.

* subversion/libsvn_wc/wc-queries.sql

 (STMT_CREATE_REVERT_LIST): Add actual column to revert_list table and

  make it part of the primary key, set the actual column when adding

  rows.

 (STMT_SELECT_REVERT_LIST): Select, and order by, actual column.

 (STMT_SELECT_REVERT_LIST_RECURSIVE): Select distinct local_relpaths

  that require notification.

* subversion/libsvn_wc/wc_db.c

 (revert_list_read): Handle getting up to two rows per path.

 (svn_wc__db_revert_list_notify): Always notify since selection is

  done in SQL.

* subversion/tests/cmdline/revert_tests.py

 (revert_empty_actual_recursive, revert_no_text_change_conflict): Remove

  XFAIL markers.

Show less