#include <svn_wc.h>
List of all members.
Detailed Description
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.
Definition at line 1845 of file svn_wc.h.
Member Data Documentation
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.
Definition at line 1876 of file svn_wc.h.
The action being attempted on the conflicted node or property. (When kind
is 'text', this action must be 'edit'.)
Definition at line 1880 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 (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 1902 of file svn_wc.h.
Whether svn thinks ('my' version of) path
is a 'binary' file. (Only if kind
is 'text', else undefined.)
Definition at line 1863 of file svn_wc.h.
What sort of conflict are we describing?
Definition at line 1855 of file svn_wc.h.
merged version; may contain conflict markers
Definition at line 1911 of file svn_wc.h.
The svn:mime-type property of ('my' version of) path
, if available, else NULL. (Only if kind
is 'text', else undefined.)
Definition at line 1868 of file svn_wc.h.
my locally-edited version of the file
Definition at line 1908 of file svn_wc.h.
The node type of the path being operated on (for a tree conflict, ### which version?)
Definition at line 1852 of file svn_wc.h.
The operation that exposed the conflict. Used only for tree conflicts.
- Since:
- New in 1.6.
Definition at line 1918 of file svn_wc.h.
The path that is in conflict (for a tree conflict, it is the victim)
Definition at line 1848 of file svn_wc.h.
The name of the property whose conflict is being described. (Only if kind is 'property'; else undefined.)
Definition at line 1859 of file svn_wc.h.
The state of the target node or property, relative to its merge-left source, that is the reason for the conflict. (When kind
is 'text', this reason must be 'edited'.)
Definition at line 1885 of file svn_wc.h.
Info on the "merge-left source" or "older" version of incoming change.
- Since:
- New in 1.6.
Definition at line 1922 of file svn_wc.h.
Info on the "merge-right source" or "their" version of incoming change.
- Since:
- New in 1.6.
Definition at line 1926 of file svn_wc.h.
their version of the file
Definition at line 1905 of file svn_wc.h.
The documentation for this struct was generated from the following file: