Checkout
Bert Huijben
committed
on 04 Jul 12
Make the base_remove wc_db api code that determines if an actual only node
should be left explicitly retrieve the conflict in preparation fo… Show more
Make the base_remove wc_db api code that determines if an actual only node

should be left explicitly retrieve the conflict in preparation for moving to

the common conflict skel.

* subversion/libsvn_wc/wc-queries.sql

 (STMT_DELETE_ACTUAL_NODE_WITHOUT_CONFLICT): Remove unused query.

* subversion/libsvn_wc/wc_db.c

 (base_remove_baton): New struct.

 (db_base_remove): Check if there is an actual node row without a tree

   conflict and if there is, remove it.

 (db_op_mark_resolved): Interpret output of svn_wc__conflict_skel_resolve

   correctly.

 (bump_node_revision): Update caller.

 (bump_revisions_baton_t): Add db variable.

 (bump_revisions_post_update,

  svn_wc__db_op_bump_revisions_post_update): Pass db variable.

Show less