#include <svn_wc.h>
Public Attributes | |
| const char * | local_abspath |
| svn_node_kind_t | node_kind |
| svn_wc_conflict_kind_t | kind |
| const char * | property_name |
| svn_boolean_t | is_binary |
| const char * | mime_type |
| svn_wc_conflict_action_t | action |
| svn_wc_conflict_reason_t | reason |
| const char * | base_abspath |
| const char * | their_abspath |
| const char * | my_abspath |
| const char * | merged_file |
| svn_wc_operation_t | operation |
| const svn_wc_conflict_version_t * | src_left_version |
| const svn_wc_conflict_version_t * | src_right_version |
Detailed Description
A struct that describes a conflict that has occurred in the working copy.
The conflict described by this structure is one of:
- a conflict on the content of the file node local_abspath
- a conflict on the property property_name of local_abspath
- a tree conflict, of which local_abspath is the victim Be aware that the victim of a tree conflict can be a non-existent node. The three kinds of conflict are distinguished by kind.
- 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_conflict_description_create_text2() or svn_wc_conflict_description_create_prop2() or svn_wc_conflict_description_create_tree2() instead.
- Since:
- New in 1.7.
Member Data Documentation
| const char* svn_wc_conflict_description2_t::base_abspath |
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.
base_abspath, their_abspath and my_abspath are absolute paths.
### Is merged_file relative to some directory, or absolute?
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.)
| const char* svn_wc_conflict_description2_t::local_abspath |
| const char* svn_wc_conflict_description2_t::merged_file |
| const char* svn_wc_conflict_description2_t::mime_type |
| const char* svn_wc_conflict_description2_t::my_abspath |
| const char* svn_wc_conflict_description2_t::property_name |
| const char* svn_wc_conflict_description2_t::their_abspath |
The documentation for this struct was generated from the following file:
