Home
last modified time | relevance | path

Searched refs:svn_wc__conflict_read_info (Results 1 – 8 of 8) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dconflicts.c686 svn_wc__conflict_read_info(svn_wc_operation_t *operation, in svn_wc__conflict_read_info() function
1064 SVN_ERR(svn_wc__conflict_read_info(&operation, NULL, in svn_wc__conflict_create_markers()
1868 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, in svn_wc__conflict_invoke_resolver()
2089 SVN_ERR(svn_wc__conflict_read_info(&operation, NULL, NULL, &prop_conflicted, in read_prop_conflict_descs()
2290 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted, in svn_wc__read_conflicts()
2408 SVN_ERR(svn_wc__conflict_read_info(&operation, NULL, NULL, &prop_conflicted, in resolve_prop_conflict_on_node()
2544 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, NULL, &prop_conflicted, in resolve_prop_conflict_on_node()
2631 SVN_ERR(svn_wc__conflict_read_info(&operation, NULL, NULL, NULL, in resolve_tree_conflict_on_node()
2706 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, NULL, NULL, in resolve_tree_conflict_on_node()
Dconflicts.h302 svn_wc__conflict_read_info(svn_wc_operation_t *operation,
Dquestions.c390 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, text_conflicted_p, in internal_conflicted_p()
Dwc_db_update_move.c246 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, NULL, NULL, in update_move_list_add()
396 SVN_ERR(svn_wc__conflict_read_info(&conflict_operation, NULL, NULL, NULL, in create_tree_conflict()
2304 SVN_ERR(svn_wc__conflict_read_info(operation, &locations, in fetch_conflict_details()
Dprops.c758 SVN_ERR(svn_wc__conflict_read_info(&operation, NULL, NULL, NULL, NULL, in svn_wc__create_prejfile()
Dentries.c946 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, &text_conflicted, in read_one_entry()
Dupdate_editor.c857 SVN_ERR(svn_wc__conflict_read_info(NULL, &locations, NULL, NULL, NULL, in complete_conflict()
Dwc_db.c6827 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, NULL, NULL, in revert_maybe_raise_moved_away()