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

API changes for tree conflicts

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 24 Oct 2008 16:00:16 +0100

This is a summary of all the public API changes in v1.6 relative to v1.5
that are related to tree conflicts.

There are a couple of queries (which I'll try to answer) in among them.


struct svn_wc_conflict_description_t
  * This structure can now describe a tree conflict. When doing so, some
existing fields are not used and a new field "operation" is used.

enum svn_wc_operation_t
  * New type, presently used only used for tree conflicts, to describe
the user command that raised a conflict.

enum svn_wc_conflict_kind_t
  * Has a new value "..._tree" to indicate a tree conflict.

  * New function.

struct svn_wc_diff_callbacks3_t
  * New version of the diff callbacks, having new methods 'dir_opened'
and 'dir_closed'.

  * Functions svn_wc_get_diff_editor5(), svn_wc_diff5() are new, like
their predecessors except that they use the new callbacks.

struct svn_wc_entry_t
  * New field 'tree_conflict_data' holds tree conflict data of immediate

  * New version of this API reports on tree conflicts as well as other
types, and has a different interface, taking the item's path and
adm_access (instead of the parent's path and the item's WC entry).

  * New field 'tree_conflicted' in the status struct.

  * New revs svn_wc_status2(), svn_wc_get_status_editor4() and callback
type svn_wc_status_func3_t use it.
  (### svn_wc_status_func2_t also uses it - is that a bug?)

  * New rev, can also resolve tree conflicts.

  * New function to get the current tree conflict description of a path.

  * New function.
  (### Not needed?)

  * New function to record a tree conflict.


  * This function now reports tree conflict info in the 'tree_conflict'
field of the reported svn_info_t.

  * This function can now report info on a path where there is no node,
if that path is the victim of a tree conflict, which can happen if an
incoming change tries to delete a node that is not there. In such a
case, only a few fields have useful values in the reported svn_info_t.

  * struct svn_info_t has a new field 'tree_conflict' describing the
tree conflict of which this path is the victim. This can be the case
even if there is no node at this path.

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-24 17:11:26 CEST

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