Lines Matching defs:conflict
210 If the versioned file has a text conflict, and the .mine file exists in
258 svn_skel_t *conflict;
262 /* Is there a text conflict at the source path? */
263 SVN_ERR(svn_wc__db_read_conflict(&conflict, NULL, NULL,
268 db, src_abspath, conflict,
519 any conflict-marker files. */
937 /* Remove the conflict markers of NODE_ABSPATH, that were left over after
950 svn_skel_t *conflict;
952 SVN_ERR(svn_wc__db_read_conflict(&conflict, NULL, NULL,
956 /* Do we have conflict markers that should be removed? */
957 if (conflict != NULL)
965 conflict,
968 /* No iterpool: Maximum number of possible conflict markers is 4 */
992 /* Remove all the conflict markers below SRC_DIR_ABSPATH, that were left over
995 This function doesn't remove the conflict markers on WC_DIR_ABSPATH
1116 conflict markers, which might also fail. */
1142 /* When we moved a directory, we moved the conflict markers
1155 NULL /* conflict */, NULL /* work_items */,