Searched refs:svn_wc__db_op_mark_conflict (Results 1 – 6 of 6) sorted by relevance
| /freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/ |
| D | tree_conflicts.c | 472 svn_wc__db_op_mark_conflict(wc_ctx->db, conflict->local_abspath, in svn_wc__add_tree_conflict()
|
| D | workqueue.c | 1311 SVN_ERR(svn_wc__db_op_mark_conflict(db, local_abspath, conflicts, in run_set_text_conflict_markers() 1378 SVN_ERR(svn_wc__db_op_mark_conflict(db, local_abspath, conflicts, in run_set_property_conflict_marker()
|
| D | merge.c | 1391 SVN_ERR(svn_wc__db_op_mark_conflict(wc_ctx->db, target_abspath, in svn_wc_merge5()
|
| D | update_editor.c | 915 SVN_ERR(svn_wc__db_op_mark_conflict(db->edit_baton->db, in mark_directory_edited() 951 SVN_ERR(svn_wc__db_op_mark_conflict(fb->edit_baton->db, in mark_file_edited() 1269 SVN_ERR(svn_wc__db_op_mark_conflict(eb->db, in open_root() 3397 SVN_ERR(svn_wc__db_op_mark_conflict(eb->db, in add_file()
|
| D | wc_db.h | 1640 svn_wc__db_op_mark_conflict(svn_wc__db_t *db,
|
| D | wc_db.c | 6622 svn_wc__db_op_mark_conflict(svn_wc__db_t *db, in svn_wc__db_op_mark_conflict() function
|