Home
last modified time | relevance | path

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

12

/trueos/contrib/subversion/subversion/libsvn_wc/
HDdelete.c114 svn_boolean_t conflicted, in create_delete_wq_items() argument
132 if (conflicted) in create_delete_wq_items()
200 svn_boolean_t conflicted = FALSE; in svn_wc__delete_many() local
209 NULL, &conflicted, in svn_wc__delete_many()
279 conflicted, in svn_wc__delete_many()
327 svn_boolean_t conflicted; in svn_wc_delete4() local
333 NULL, NULL, NULL, NULL, NULL, NULL, &conflicted, in svn_wc_delete4()
392 conflicted, in svn_wc_delete4()
HDcopy.c183 svn_boolean_t conflicted, in copy_versioned_file() argument
206 if (conflicted) in copy_versioned_file()
395 metadata_only, info->conflicted, in copy_versioned_dir()
529 svn_boolean_t conflicted; in copy_or_move() local
554 NULL, &conflicted, NULL, NULL, NULL, NULL, in copy_or_move()
770 metadata_only, conflicted, is_move, in copy_or_move()
948 if (info->conflicted) in remove_all_conflict_markers()
987 svn_boolean_t conflicted; in svn_wc__move2() local
1026 &conflicted, NULL, NULL, NULL, in svn_wc__move2()
1035 if (conflicted) in svn_wc__move2()
HDupdate_editor.c620 already_in_a_tree_conflict(svn_boolean_t *conflicted,
1648 already_in_a_tree_conflict(svn_boolean_t *conflicted, in already_in_a_tree_conflict() argument
1659 *conflicted = *ignored = FALSE; in already_in_a_tree_conflict()
1667 SVN_ERR(svn_wc__conflicted_for_update_p(conflicted, ignored, db, in already_in_a_tree_conflict()
1670 if (*conflicted || *ignored) in already_in_a_tree_conflict()
1688 node_already_conflicted(svn_boolean_t *conflicted, in node_already_conflicted() argument
1694 SVN_ERR(svn_wc__conflicted_for_update_p(conflicted, conflict_ignored, db, in node_already_conflicted()
1716 svn_boolean_t conflicted; in delete_entry() local
1762 &conflicted, NULL, NULL, NULL, in delete_entry()
1794 conflicted = FALSE; /* Conflict applies to WORKING */ in delete_entry()
[all …]
HDstatus.c375 svn_boolean_t conflicted; in assemble_status() local
525 conflicted = info->conflicted; in assemble_status()
526 if (conflicted) in assemble_status()
537 conflicted = FALSE; in assemble_status()
621 && (! conflicted)) in assemble_status()
689 stat->conflicted = conflicted; in assemble_status()
770 stat->conflicted = tree_conflicted; in assemble_unversioned()
1000 if (status->conflicted) in send_unversioned_item()
1086 svn_boolean_t conflicted = info ? info->conflicted in one_child_status() local
1133 if (! conflicted) in one_child_status()
[all …]
HDinfo.c95 svn_boolean_t conflicted; in build_info_for_node() local
122 &conflicted, &op_root, NULL, NULL, in build_info_for_node()
312 if (conflicted) in build_info_for_node()
HDwc_db_wcroot.c783 svn_boolean_t conflicted; in svn_wc__db_wcroot_parse_local_abspath() local
796 NULL, NULL, NULL, &conflicted, in svn_wc__db_wcroot_parse_local_abspath()
818 && !conflicted); in svn_wc__db_wcroot_parse_local_abspath()
HDmerge.c1244 svn_boolean_t conflicted; in svn_wc_merge5() local
1249 &conflicted, NULL, &had_props, &props_mod, in svn_wc_merge5()
1263 if (conflicted) in svn_wc_merge5()
HDutil.c448 if (old_status->conflicted) in svn_wc__status2_from_3()
517 && old_status->conflicted in svn_wc__status2_from_3()
HDwc_db_private.h233 svn_boolean_t *conflicted,
HDadm_ops.c703 svn_boolean_t conflicted; in check_can_add_node() local
709 &conflicted, in check_can_add_node()
730 if (conflicted) in check_can_add_node()
HDconflicts.c1905 apr_hash_t *conflicted; in svn_wc__conflict_invoke_resolver() local
1914 &conflicted, in svn_wc__conflict_invoke_resolver()
1927 for (hi = apr_hash_first(scratch_pool, conflicted); in svn_wc__conflict_invoke_resolver()
2899 if (!status->conflicted) in conflict_status_walker()
3034 svn_boolean_t conflicted; in svn_wc__resolve_conflicts() local
3048 NULL, NULL, NULL, NULL, NULL, NULL, &conflicted, in svn_wc__resolve_conflicts()
HDprops.c205 svn_boolean_t conflicted; in svn_wc_merge_props3() local
215 NULL, NULL, NULL, NULL, NULL, &conflicted, NULL, in svn_wc_merge_props3()
239 else if (conflicted) in svn_wc_merge_props3()
HDwc_db.h1895 svn_boolean_t *conflicted,
1940 svn_boolean_t conflicted; member
HDentries.c393 svn_boolean_t conflicted; in read_one_entry() local
422 &conflicted, in read_one_entry()
879 if (conflicted) in read_one_entry()
HDwc_db.c324 svn_boolean_t *conflicted,
8340 svn_boolean_t *conflicted, in read_info() argument
8366 if (changelist || conflicted || props_mod) in read_info()
8506 if (conflicted) in read_info()
8510 *conflicted = in read_info()
8514 *conflicted = FALSE; in read_info()
8577 SVN_ERR_ASSERT(conflicted); in read_info()
8619 if (conflicted) in read_info()
8620 *conflicted = TRUE; in read_info()
8670 svn_boolean_t *conflicted, in svn_wc__db_read_info_internal() argument
[all …]
/trueos/contrib/subversion/subversion/svn/
HDstatus.c73 if (!status->versioned && status->conflicted) in combined_status()
251 if (status->conflicted) in print_status()
486 if (status->conflicted) in svn_cl__print_status_xml()
595 || status->conflicted in svn_cl__print_status()
608 && (! status->conflicted)) in svn_cl__print_status()
623 && (! status->conflicted)) in svn_cl__print_status()
/trueos/contrib/subversion/subversion/svn/schema/
HDstatus.rnc54 "added" | "conflicted" | "deleted" | "external" | "ignored" |
59 attribute props { "conflicted" | "modified" | "normal" | "none" },
73 attribute tree-conflicted { "true" | "false" }?,
/trueos/contrib/subversion/subversion/libsvn_client/
HDstatus.c692 (*cst)->conflicted = status->conflicted; in svn_client__create_status()
740 if (status->versioned && status->conflicted) in svn_client__create_status()
HDcommit_util.c621 if (!copy_mode && !status->conflicted in harvest_status_callback()
653 if (status->conflicted && matches_changelists) in harvest_status_callback()
689 if (status->conflicted && status->kind == svn_node_unknown) in harvest_status_callback()
HDpatch.c458 status->conflicted) in resolve_target_path()
/trueos/contrib/subversion/subversion/include/
HDsvn_client.h2284 svn_boolean_t conflicted; member
HDsvn_wc.h3612 svn_boolean_t conflicted; member
/trueos/contrib/subversion/
HDCHANGES1706 * fixed: assertion triggered by tree-conflicted externals (issue #3469)
1951 * fixed: repeated merging of conflicted properties fails (issue #3250)
2648 * fixed: 'svn merge' should notify about conflicted files (issue #2584)
2728 * fixed: 'svn status' shows added and conflicted files as added (r20382)
5026 * new 'svn resolve' command removes conflicted state (by removing backups)
/trueos/contrib/libreadline/
HDCHANGES486 because the use of __P in typedefs conflicted g++ and glibc.
/trueos/contrib/amd/
HDNEWS1331 and they conflicted with am-utils'. The only solution was to more or less

12