Home
last modified time | relevance | path

Searched refs:conflicted (Results 1 – 25 of 35) sorted by relevance

12

/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Ddelete.c114 svn_boolean_t conflicted, in create_delete_wq_items() argument
132 if (conflicted) in create_delete_wq_items()
201 svn_boolean_t conflicted = FALSE; in svn_wc__delete_many() local
210 NULL, &conflicted, in svn_wc__delete_many()
280 conflicted, in svn_wc__delete_many()
328 svn_boolean_t conflicted; in svn_wc_delete4() local
334 NULL, NULL, NULL, NULL, NULL, NULL, &conflicted, in svn_wc_delete4()
393 conflicted, in svn_wc_delete4()
Dupdate_editor.c634 already_in_a_tree_conflict(svn_boolean_t *conflicted,
1544 already_in_a_tree_conflict(svn_boolean_t *conflicted, in already_in_a_tree_conflict() argument
1555 *conflicted = *ignored = FALSE; in already_in_a_tree_conflict()
1563 SVN_ERR(svn_wc__conflicted_for_update_p(conflicted, ignored, db, in already_in_a_tree_conflict()
1566 if (*conflicted || *ignored) in already_in_a_tree_conflict()
1584 node_already_conflicted(svn_boolean_t *conflicted, in node_already_conflicted() argument
1590 SVN_ERR(svn_wc__conflicted_for_update_p(conflicted, conflict_ignored, db, in node_already_conflicted()
1613 svn_boolean_t conflicted; in delete_entry() local
1658 &conflicted, NULL, NULL, NULL, in delete_entry()
1689 conflicted = FALSE; /* Conflict applies to WORKING */ in delete_entry()
[all …]
Dcopy.c228 svn_boolean_t conflicted, in copy_versioned_file() argument
254 if (conflicted) in copy_versioned_file()
446 metadata_only, info->conflicted, in copy_versioned_dir()
591 svn_boolean_t conflicted; in copy_or_move() local
619 NULL, &conflicted, NULL, NULL, NULL, NULL, in copy_or_move()
841 metadata_only, conflicted, is_move, in copy_or_move()
1030 if (info->conflicted) in remove_all_conflict_markers()
1070 svn_boolean_t conflicted; in svn_wc__move2() local
1127 &conflicted, NULL, NULL, NULL, in svn_wc__move2()
1137 if (conflicted) in svn_wc__move2()
Dstatus.c357 svn_boolean_t conflicted; in assemble_status() local
500 conflicted = info->conflicted; in assemble_status()
501 if (conflicted) in assemble_status()
512 conflicted = FALSE; in assemble_status()
597 && (! conflicted) in assemble_status()
683 stat->conflicted = conflicted; in assemble_status()
777 stat->conflicted = tree_conflicted; in assemble_unversioned()
1009 if (status->s.conflicted) in send_unversioned_item()
1095 svn_boolean_t conflicted = info ? info->conflicted in one_child_status() local
1142 if (! conflicted) in one_child_status()
[all …]
Dadm_crawler.c388 svn_boolean_t conflicted; in report_revisions_and_depths() local
393 NULL, NULL, NULL, NULL, &conflicted, in report_revisions_and_depths()
413 conflicted, use_commit_times, in report_revisions_and_depths()
723 svn_boolean_t conflicted; in svn_wc_crawl_revisions5() local
728 NULL, &conflicted, NULL, NULL, NULL, NULL, in svn_wc_crawl_revisions5()
749 wrk_kind, conflicted, use_commit_times, in svn_wc_crawl_revisions5()
Dinfo.c95 svn_boolean_t conflicted; in build_info_for_node() local
122 &conflicted, &op_root, NULL, NULL, in build_info_for_node()
285 if (conflicted) in build_info_for_node()
Dwc_db_wcroot.c874 svn_boolean_t conflicted; in svn_wc__db_wcroot_parse_local_abspath() local
887 NULL, NULL, NULL, &conflicted, in svn_wc__db_wcroot_parse_local_abspath()
909 && !conflicted); in svn_wc__db_wcroot_parse_local_abspath()
Dmerge.c1248 svn_boolean_t conflicted; in svn_wc_merge5() local
1253 &conflicted, NULL, &had_props, &props_mod, in svn_wc_merge5()
1267 if (conflicted) in svn_wc_merge5()
Dadm_ops.c416 svn_boolean_t conflicted; in check_can_add_node() local
422 &conflicted, in check_can_add_node()
443 if (conflicted) in check_can_add_node()
Dconflicts.c1893 apr_hash_t *conflicted; in svn_wc__conflict_invoke_resolver() local
1902 &conflicted, in svn_wc__conflict_invoke_resolver()
1915 for (hi = apr_hash_first(scratch_pool, conflicted); in svn_wc__conflict_invoke_resolver()
2983 if (!status->conflicted) in conflict_status_walker()
3134 svn_boolean_t conflicted; in svn_wc__resolve_conflicts() local
3143 NULL, NULL, NULL, NULL, NULL, NULL, &conflicted, in svn_wc__resolve_conflicts()
Dwc_db_private.h247 svn_boolean_t *conflicted,
Dprops.c180 svn_boolean_t conflicted; in svn_wc_merge_props3() local
190 NULL, NULL, NULL, NULL, NULL, &conflicted, NULL, in svn_wc_merge_props3()
214 else if (conflicted) in svn_wc_merge_props3()
Dwc_db.h1952 svn_boolean_t *conflicted,
1997 svn_boolean_t conflicted; member
Dentries.c415 svn_boolean_t conflicted; in read_one_entry() local
444 &conflicted, in read_one_entry()
937 if (conflicted) in read_one_entry()
Dwc_db.c324 svn_boolean_t *conflicted,
8824 svn_boolean_t *conflicted, in read_info() argument
8850 if (changelist || conflicted || props_mod) in read_info()
8987 if (conflicted) in read_info()
8991 *conflicted = in read_info()
8995 *conflicted = FALSE; in read_info()
9058 SVN_ERR_ASSERT(conflicted); in read_info()
9100 if (conflicted) in read_info()
9101 *conflicted = TRUE; in read_info()
9149 svn_boolean_t *conflicted, in svn_wc__db_read_info_internal() argument
[all …]
Ddeprecated.c2758 if (old_status->conflicted) in svn_wc__status2_from_3()
2827 && old_status->conflicted in svn_wc__status2_from_3()
/freebsd-10-stable/contrib/subversion/subversion/svn/
Dstatus.c73 if (!status->versioned && status->conflicted) in combined_status()
249 if (status->conflicted) in print_status()
484 if (status->conflicted) in svn_cl__print_status_xml()
592 || status->conflicted in svn_cl__print_status()
605 && (! status->conflicted)) in svn_cl__print_status()
620 && (! status->conflicted)) in svn_cl__print_status()
/freebsd-10-stable/contrib/subversion/subversion/svn/schema/
Dstatus.rnc54 "added" | "conflicted" | "deleted" | "external" | "ignored" |
59 attribute props { "conflicted" | "modified" | "normal" | "none" },
73 attribute tree-conflicted { "true" | "false" }?,
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dstatus.c701 (*cst)->conflicted = status->conflicted; in svn_client__create_status()
749 if (status->versioned && status->conflicted) in svn_client__create_status()
Dcommit_util.c623 if (!copy_mode && !status->conflicted in harvest_status_callback()
655 if (status->conflicted && matches_changelists) in harvest_status_callback()
691 if (status->conflicted && status->kind == svn_node_unknown) in harvest_status_callback()
Dpatch.c463 status->conflicted) in resolve_target_path()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_client.h2319 svn_boolean_t conflicted; member
Dsvn_wc.h3704 svn_boolean_t conflicted; member
/freebsd-10-stable/contrib/amd/
DNEWS164 since the code, documentation, and comments often conflicted with each
1409 and they conflicted with am-utils'. The only solution was to more or less
/freebsd-10-stable/contrib/libreadline/
DCHANGES486 because the use of __P in typedefs conflicted g++ and glibc.

12