Data Fields |
const char * | path |
| The path that is in conflict (for a tree conflict, it is the victim)
|
svn_node_kind_t | node_kind |
| The node type of the path being operated on (for a tree conflict,
which version?)
|
svn_wc_conflict_kind_t | kind |
| What sort of conflict are we describing?
|
const char * | property_name |
| The name of the property whose conflict is being described.
|
svn_boolean_t | is_binary |
| Whether svn thinks ('my' version of) path is a 'binary' file.
|
const char * | mime_type |
| The svn:mime-type property of ('my' version of) path , if available, else NULL.
|
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.) For a tree conflict, this will always be an access baton to the parent directory of the path, even if the path is a directory.
|
svn_wc_conflict_action_t | action |
| The action being attempted on the conflicted node or property.
|
svn_wc_conflict_reason_t | reason |
| The state of the target node or property, relative to its merge-left source, that is 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
|
svn_wc_operation_t | operation |
| The operation that exposed the conflict.
|
svn_wc_conflict_version_t * | src_left_version |
| Info on the "merge-left source" or "older" version of incoming change.
|
svn_wc_conflict_version_t * | src_right_version |
| Info on the "merge-right source" or "their" version of incoming change.
|
A struct that describes a conflict that has occurred in the working copy.
Passed to svn_wc_conflict_resolver_func_t
.
The conflict described by this structure is one of:
- a conflict on the content of the file node path
- a conflict on the property property_name of path
- 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 but should use svn_wc_create_conflict_description_text() or svn_wc_create_conflict_description_prop() or svn_wc_create_conflict_description_tree() instead.
- Since:
- New in 1.5.
Definition at line 1321 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 1378 of file svn_wc.h.