svn_wc_conflict_description_t Struct Reference
[Conflict callback functionality]

A struct that describes a conflict that has occurred in the working copy. More...

#include <svn_wc.h>

Data Fields
const char *	path
	The path that is being operated on.
svn_node_kind_t	node_kind
	The node type of the path being operated on.
svn_wc_conflict_kind_t	kind
	What sort of conflict are we describing?
const char *	property_name
	Only set if this is a property conflict.
svn_boolean_t	is_binary
	The following only apply to file objects: Whether svn thinks the object is a binary file.
const char *	mime_type
	mime-type of the object
svn_wc_adm_access_t *	access
	If not NULL, an open working copy access baton to either the path itself (if path is a directory), or to the parent directory (if path is a file.
svn_wc_conflict_action_t	action
	The action being attempted on path.
svn_wc_conflict_reason_t	reason
	The reason for the conflict.
const char *	base_file
	If this is text-conflict and involves the merging of two files descended from a common ancestor, here are the paths of up to four fulltext files that can be used to interactively resolve the conflict.
const char *	their_file
	their version of the file
const char *	my_file
	my locally-edited version of the file
const char *	merged_file
	merged version; may contain conflict markers

---

Detailed Description

A struct that describes a conflict that has occurred in the working copy.

Passed to svn_wc_conflict_resolver_func_t.

Note:

Fields may be added to the end of this structure in future versions. Therefore, to preserve binary compatibility, users should not directly allocate structures of this type.

Since:

New in 1.5.

Definition at line 1091 of file svn_wc.h.

---

Field Documentation

svn_boolean_t svn_wc_conflict_description_t::is_binary

The following only apply to file objects:

• Whether svn thinks the object is a binary file.

• If available (non-NULL), the svn:mime-type property of the path

Definition at line 1108 of file svn_wc.h.

svn_wc_adm_access_t* svn_wc_conflict_description_t::access

If not NULL, an open working copy access baton to either the path itself (if path is a directory), or to the parent directory (if path is a file.

)

Definition at line 1116 of file svn_wc.h.

const char* svn_wc_conflict_description_t::base_file

If this is text-conflict and involves the merging of two files descended from a common ancestor, here are the paths of up to four fulltext files that can be used to interactively resolve the conflict.

All four files will be in repository-normal form -- LF line endings and contracted keywords. (If any of these files are not available, they default to NULL.)

On the other hand, if this is a property-conflict, then these paths represent temporary files that contain the three different property-values in conflict. The fourth path (merged_file) may or may not be NULL; if set, it represents libsvn_wc's attempt to merge the property values together. (Remember that property values are technically binary values, and thus can't always be merged.)

Definition at line 1139 of file svn_wc.h.

---

The documentation for this struct was generated from the following file:

• svn_wc.h

---