#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 |
Passed to svn_wc_conflict_resolver_func_t
.
Definition at line 1091 of file svn_wc.h.
|
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 ( |
|
The following only apply to file objects: Whether svn thinks the object is a binary file.
|