Checkout
rhuijben
committed
on 05 Jul 12
Following up on r1357929, also add conflict and work_items to
svn_wc__db_op_delete(). This allows reinstalling the tree_conflict
again in th… Show more
Following up on r1357929, also add conflict and work_items to

svn_wc__db_op_delete(). This allows reinstalling the tree_conflict

again in the update_editor for when it has just been deleted.

Avoid setting up and removing the notification table if no

notifications are required, such as from the update editor.

* subversion/libsvn_wc/adm_ops.c

 (svn_wc__delete_internal): Update caller.

* subversion/libsvn_wc/update_editor.c

 (delete_entry): Update caller.

 (add_directory): Update caller. Pass conflict.

* subversion/libsvn_wc/wc_db.c

 (op_delete_baton_t): Add variables.

 (delete_node): Allow setting work_items and conflict. Make notify

   handling optional.

 (svn_wc__db_op_delete): Reorder arguments. Optimize non-notify case

   Allow setting work_items and conflict.

* subversion/libsvn_wc/wc_db.h

 (svn_wc__db_op_delete): Reorder arguments as suggested by TODO. Add standard

   arguments.

* subversion/tests/libsvn_wc/op-depth-test.c

 (do_delete): Update caller.

Show less