Struct svn_wc_conflict_result_t 

#[repr(C)]
pub struct svn_wc_conflict_result_t {
    pub choice: svn_wc_conflict_choice_t,
    pub merged_file: *const c_char,
    pub save_merged: svn_boolean_t,
    pub merged_value: *const svn_string_t,
}

The final result returned by #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. Instead, construct this structure using svn_wc_create_conflict_result() below.

@since New in 1.5.

Fields

choice: svn_wc_conflict_choice_t

A choice to either delay the conflict resolution or select a particular file to resolve the conflict.

merged_file: *const c_char

If not NULL, this is a path to a file which contains the client’s (or more likely, the user’s) merging of the three values in conflict. libsvn_wc accepts this file if (and only if) @c choice is set to #svn_wc_conflict_choose_merged.

save_merged: svn_boolean_t

If true, save a backup copy of merged_file (or the original merged_file from the conflict description, if merged_file is NULL) in the user’s working copy.

merged_value: *const svn_string_t

If not NULL, this is the new merged property, used when choosing #svn_wc_conflict_choose_merged. This value is prefered over using merged_file.

@since New in 1.9.

Trait Implementations

impl Clone for svn_wc_conflict_result_t

fn clone(&self) -> svn_wc_conflict_result_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_result_t

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

Formats the value using the given formatter.

impl Default for svn_wc_conflict_result_t

fn default() -> Self

Returns the “default value” for a type.

impl Copy for svn_wc_conflict_result_t