Searched refs:did_resolve (Results 1 – 1 of 1) sorted by relevance
| /trueos/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 2368 resolve_text_conflict_on_node(svn_boolean_t *did_resolve, in resolve_text_conflict_on_node() argument
2387 *did_resolve = FALSE; in resolve_text_conflict_on_node()
2490 SVN_ERR(remove_artifact_file_if_exists(&work_item, did_resolve, in resolve_text_conflict_on_node()
2495 SVN_ERR(remove_artifact_file_if_exists(&work_item, did_resolve, in resolve_text_conflict_on_node()
2500 SVN_ERR(remove_artifact_file_if_exists(&work_item, did_resolve, in resolve_text_conflict_on_node()
2550 resolve_prop_conflict_on_node(svn_boolean_t *did_resolve, in resolve_prop_conflict_on_node() argument
2572 *did_resolve = FALSE; in resolve_prop_conflict_on_node()
2680 SVN_ERR(remove_artifact_file_if_exists(&work_item, did_resolve, in resolve_prop_conflict_on_node()
2704 resolve_tree_conflict_on_node(svn_boolean_t *did_resolve, in resolve_tree_conflict_on_node() argument
2720 *did_resolve = FALSE; in resolve_tree_conflict_on_node()
[all …]
|