Checkout
Julian Foad
committed
on 13 Nov 08
Make the tree-conflict WC APIs private to Subversion (but shared across
libraries). Previously, two were public and the third was private to… Show more
Make the tree-conflict WC APIs private to Subversion (but shared across

libraries). Previously, two were public and the third was private to

libsvn_wc. This is issue #3321.

* subversion/include/private/svn_wc_private.h

 (svn_wc__get_tree_conflict, svn_wc__add_tree_conflict): New, moved from

   svn_wc_get_tree_conflict and svn_wc_add_tree_conflict respectively in

   svn_wc.h.

 (svn_wc__del_tree_conflict): Moved from tree_conflicts.h.

* subversion/include/svn_wc.h

 (svn_wc_get_tree_conflict, svn_wc_add_tree_conflict): Rename and move

   to svn_wc_private.h.

* subversion/libsvn_client/info.c

 (info_found_entry_callback, info_error_handler): Adjust calls.

* subversion/libsvn_client/merge.c

 (tree_conflict): Adjust calls.

* subversion/libsvn_wc/adm_ops.c

 (revert_internal, resolve_found_entry_callback): Adjust calls.

* subversion/libsvn_wc/entries.c

 (visit_tc_too_error_handler, svn_wc__walk_entries_and_tc): Adjust calls.

* subversion/libsvn_wc/questions.c

 (svn_wc_conflicted_p2): Adjust calls.

* subversion/libsvn_wc/status.c

 (get_dir_status): Adjust calls.

* subversion/libsvn_wc/tree_conflicts.c

 (svn_wc_add_tree_conflict, svn_wc_get_tree_conflict): Rename to

   svn_wc__add_tree_conflict and svn_wc__get_tree_conflict respectively.

* subversion/libsvn_wc/tree_conflicts.h

 (svn_wc__del_tree_conflict): Rename and move to svn_wc_private.h.

Show less