Searched refs:prop_conflict (Results 1 – 1 of 1) sorted by relevance
| /trueos/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 426 svn_skel_t *prop_conflict; in svn_wc__conflict_skel_add_prop_conflict() local
432 SVN_ERR(conflict__get_conflict(&prop_conflict, conflict_skel, in svn_wc__conflict_skel_add_prop_conflict()
435 SVN_ERR_ASSERT(!prop_conflict); /* ### Use proper error? */ in svn_wc__conflict_skel_add_prop_conflict()
448 prop_conflict = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_add_prop_conflict()
453 svn_skel__prepend(props, prop_conflict); in svn_wc__conflict_skel_add_prop_conflict()
456 svn_skel__prepend_str("", prop_conflict, result_pool); /* No their_props */ in svn_wc__conflict_skel_add_prop_conflict()
461 svn_skel__prepend(props, prop_conflict); in svn_wc__conflict_skel_add_prop_conflict()
464 svn_skel__prepend_str("", prop_conflict, result_pool); /* No mine_props */ in svn_wc__conflict_skel_add_prop_conflict()
470 svn_skel__prepend(props, prop_conflict); in svn_wc__conflict_skel_add_prop_conflict()
473 svn_skel__prepend_str("", prop_conflict, result_pool); /* No old_props */ in svn_wc__conflict_skel_add_prop_conflict()
[all …]
|