Struct svn_wc_conflict_description_t 

#[repr(C)]
pub struct svn_wc_conflict_description_t {

    pub path: *const c_char,
    pub node_kind: svn_node_kind_t,
    pub kind: svn_wc_conflict_kind_t,
    pub property_name: *const c_char,
    pub is_binary: svn_boolean_t,
    pub mime_type: *const c_char,
    pub access: *mut svn_wc_adm_access_t,
    pub action: svn_wc_conflict_action_t,
    pub reason: svn_wc_conflict_reason_t,
    pub base_file: *const c_char,
    pub their_file: *const c_char,
    pub my_file: *const c_char,
    pub merged_file: *const c_char,
    pub operation: svn_wc_operation_t,
    pub src_left_version: *mut svn_wc_conflict_version_t,
    pub src_right_version: *mut svn_wc_conflict_version_t,
}

Similar to #svn_wc_conflict_description2_t, but with relative paths and adm_access batons. Passed to #svn_wc_conflict_resolver_func_t.

@since New in 1.5. @deprecated Provided for backward compatibility with the 1.6 API.

Fields

path: *const c_char

The path that is in conflict (for a tree conflict, it is the victim)

node_kind: svn_node_kind_t

The local node type of the path being operated on (for a tree conflict, this specifies the local node kind, which may be (and typically is) different than the left and right kind)

kind: svn_wc_conflict_kind_t

What sort of conflict are we describing?

property_name: *const c_char

The name of the property whose conflict is being described. (Only if @a kind is ‘property’; else undefined.)

is_binary: svn_boolean_t

Whether svn thinks (‘my’ version of) @c path is a ‘binary’ file. (Only if @c kind is ‘text’, else undefined.)

mime_type: *const c_char

The svn:mime-type property of (‘my’ version of) @c path, if available, else NULL. (Only if @c kind is ‘text’, else undefined.)

access: *mut svn_wc_adm_access_t

If not NULL, an open working copy access baton to either the path itself (if @c path is a directory), or to the parent directory (if @c 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.

action: svn_wc_conflict_action_t

The action being attempted on the conflicted node or property. (When @c kind is ‘text’, this action must be ‘edit’.)

reason: svn_wc_conflict_reason_t

The state of the target node or property, relative to its merge-left source, that is the reason for the conflict. (When @c kind is ‘text’, this reason must be ‘edited’.)

base_file: *const c_char

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 (@c 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.)

their_file: *const c_char

their version of the file

my_file: *const c_char

my locally-edited version of the file

merged_file: *const c_char

merged version; may contain conflict markers

operation: svn_wc_operation_t

The operation that exposed the conflict. Used only for tree conflicts.

@since New in 1.6.

src_left_version: *mut svn_wc_conflict_version_t

Info on the “merge-left source” or “older” version of incoming change. @since New in 1.6.

src_right_version: *mut svn_wc_conflict_version_t

Info on the “merge-right source” or “their” version of incoming change. @since New in 1.6.

Trait Implementations

impl Clone for svn_wc_conflict_description_t

fn clone(&self) -> svn_wc_conflict_description_t

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for svn_wc_conflict_description_t

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Default for svn_wc_conflict_description_t

fn default() -> Self

Returns the “default value” for a type.

impl Copy for svn_wc_conflict_description_t