/freebsd-11-stable/usr.bin/getconf/ |
H A D | Makefile | 14 .PHONY: conflicts 16 all: conflicts 26 conflicts: conflicting.names unique.names 28 echo "Name conflicts found!" >&2; \
|
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
H A D | info.c | 47 if (info->conflicts) 52 = apr_array_make(pool, info->conflicts->nelts, info->conflicts->elt_size); 53 for (i = 0; i < info->conflicts->nelts; i++) 57 APR_ARRAY_IDX(info->conflicts, i, 61 new_info->conflicts = new_conflicts; 287 SVN_ERR(svn_wc__read_conflicts(&wc_info->conflicts, NULL, 290 FALSE /* only tree conflicts */, 293 wc_info->conflicts = NULL; 350 /* The set of tree conflicts tha 513 const apr_array_header_t *conflicts; local [all...] |
H A D | questions.c | 44 #include "conflicts.h" 371 svn_skel_t *conflicts; 375 SVN_ERR(svn_wc__db_read_conflict(&conflicts, NULL, NULL, 379 if (!conflicts) 395 db, local_abspath, conflicts, 415 db, local_abspath, conflicts, 458 db, local_abspath, conflicts, 482 conflicts, 368 svn_skel_t *conflicts; local
|
H A D | tree_conflicts.c | 30 #include "conflicts.h" 484 const apr_array_header_t *conflicts; local 488 SVN_ERR(svn_wc__read_conflicts(&conflicts, NULL, 491 TRUE /* only tree conflicts */, 494 if (!conflicts || conflicts->nelts == 0) 500 for (i = 0; i < conflicts->nelts; i++) 504 desc = APR_ARRAY_IDX(conflicts, i, svn_wc_conflict_description2_t *);
|
H A D | workqueue.c | 38 #include "conflicts.h" 1101 svn_skel_t *conflicts; local 1110 SVN_ERR(svn_wc__db_read_conflict(&conflicts, NULL, NULL, db, local_abspath, 1115 db, local_abspath, conflicts, 1288 svn_skel_t *conflicts; local 1290 SVN_ERR(svn_wc__db_read_conflict(&conflicts, NULL, NULL, db, local_abspath, 1293 if (! conflicts) 1296 conflicts = svn_wc__conflict_skel_create(scratch_pool); 1298 SVN_ERR(svn_wc__conflict_skel_set_op_update(conflicts, NULL, NULL, 1304 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(conflicts, d 1353 svn_skel_t *conflicts; local [all...] |
H A D | conflicts.c | 2 * conflicts.c: routines for managing conflict data. 48 #include "conflicts.h" 595 /* Tree conflicts have no marker files */ 1004 /* Only set for update and switch tree conflicts */ 1052 /* Walk the conflicts */ 1114 /* Ok, currently we have to do a few things for property conflicts: 1232 /* ### For property conflicts, cd2 stores prop_reject_abspath in 1324 /* ### For property conflicts, cd2 stores prop_reject_abspath in 1435 /* Perform a 3-way merge in which conflicts are expected, showing the 1436 * conflicts i 2102 read_prop_conflict_descs(apr_array_header_t *conflicts, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflict_skel, svn_boolean_t create_tempfiles, svn_node_kind_t node_kind, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 2286 svn_wc__read_conflicts(const apr_array_header_t **conflicts, svn_skel_t **conflict_skel, svn_wc__db_t *db, const char *local_abspath, svn_boolean_t create_tempfiles, svn_boolean_t only_tree_conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 2378 svn_wc__read_conflict_descriptions2_t(const apr_array_header_t **conflicts, svn_wc_context_t *wc_ctx, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 2427 resolve_prop_conflict_on_node(svn_boolean_t *did_resolve, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflicts, const char *conflicted_propname, svn_wc_conflict_choice_t conflict_choice, const char *merged_file, const svn_string_t *merged_value, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument 2685 resolve_tree_conflict_on_node(svn_boolean_t *did_resolve, svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflicts, svn_wc_conflict_choice_t conflict_choice, apr_hash_t *resolve_later, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument 2950 svn_skel_t *conflicts; local 3027 const apr_array_header_t *conflicts; local 3452 svn_skel_t *conflicts; local 3504 const apr_array_header_t *conflicts; local 3591 const apr_array_header_t *conflicts; local 3669 const apr_array_header_t *conflicts; local 3755 const apr_array_header_t *conflicts; local 3824 const apr_array_header_t *conflicts; local [all...] |
H A D | wc.h | 87 * The bump to 10 added tree-conflicts, file externals and a different 300 conflicts. This .prej file will appear *within* the conflicted 373 If there are any conflicts, append a conflict description to 377 conflicts in the text of the file TARGET_ABSPATH using LEFT_LABEL, 477 * moved-away-edit tree conflicts. If CONFLICT_IGNORED_P is not NULL 479 * and FALSE otherwise. Also ignores text and property conflicts if 608 svn_wc__upgrade_conflict_skel_from_raw(svn_skel_t **conflicts, 637 * for all conflicts that have LOCAL_ABSPATH as victim. 641 * If CREATE_TEMPFILES is TRUE, create temporary files for property conflicts. 647 svn_wc__read_conflicts(const apr_array_header_t **conflicts, [all...] |
H A D | wc_db_private.h | 417 const svn_skel_t *conflicts,
|
H A D | revert.c | 431 apr_hash_t *children, *conflicts; 438 SVN_ERR(svn_wc__db_read_children_info(&children, &conflicts, 430 apr_hash_t *children, *conflicts; local
|
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
H A D | merge_elements.c | 114 * Set *CONFLICTS_P to describe any conflicts, or set *CONFLICTS_P to 149 * SRC_LEFT:SRC_RIGHT. If there are no conflicts, write the result to the 168 void *conflicts; local 185 SVN_ERR(merge_trees(&merge_result, &conflicts, 189 /* check for (new style) conflicts in the result; if any, bail out */ 190 if (conflicts) 193 _("Merge had conflicts; "
|
/freebsd-11-stable/usr.bin/svn/lib/libsvn_wc/ |
H A D | Makefile | 15 conflicts.c \
|
/freebsd-11-stable/contrib/byacc/ |
H A D | output.c | 19 static Value_t *conflicts = NULL; variable 404 if (conflicts[i + j] != conflicts[cbase + j]) 454 conflicts[nconflicts++] = -1; 463 if (conflicts[cbase] == -1) 490 conflicts[nconflicts++] = p->number; 499 conflicts[nconflicts++] = -1; 501 conflicts[nconflicts++] = (Value_t)(p->number - 2); 510 conflicts[nconflicts++] = -1; 519 if (conflicts[cbas [all...] |
/freebsd-11-stable/usr.bin/svn/lib/libsvn_client/ |
H A D | Makefile | 20 conflicts.c \
|
/freebsd-11-stable/contrib/byacc/test/ |
H A D | run_make.sh | 109 bison -Wno-other -Wno-conflicts-sr -Wconflicts-rr -y run_make.y
|
/freebsd-11-stable/usr.bin/svn/svn/ |
H A D | Makefile | 15 cl-conflicts.c \
|
/freebsd-11-stable/contrib/gcc/ |
H A D | global.c | 65 for conflicts between allocnos and explicit hard register use 161 /* Define the number of bits in each element of `conflicts' and what 172 `conflicts' is symmetric after the call to mirror_conflicts. */ 174 static INT_TYPE *conflicts; 177 This is the length of a row in `conflicts'. */ 181 /* Two macros to test or store 1 in an element of `conflicts'. */ 184 (conflicts[(I) * allocno_row_words + (unsigned) (J) / INT_BITS] \ 210 /* For any allocno that conflicts with IN_ALLOCNO, set OUT_ALLOCNO to 214 EXECUTE_IF_SET_IN_ALLOCNO_SET (conflicts + (IN_ALLOCNO) * allocno_row_words,\ 532 conflicts 173 static INT_TYPE *conflicts; variable [all...] |
/freebsd-11-stable/contrib/subversion/subversion/svn/ |
H A D | info-cmd.c | 48 #include "cl-conflicts.h" 678 if (info->wc_info && info->wc_info->conflicts) 684 for (i = 0; i < info->wc_info->conflicts->nelts; i++) 687 APR_ARRAY_IDX(info->wc_info->conflicts, i, 888 if (info->wc_info->conflicts) 897 APR_ARRAY_IDX(info->wc_info->conflicts, 0, 977 /* We only store one left and right version for all conflicts, which is 978 referenced from all conflicts. 979 Print it after the conflicts to match the 1.6/1.7 output where it is 980 only available for tree conflicts */ [all...] |
H A D | shelf-cmd.c | 381 unsigned int conflicts; local 390 &conflicts, &conflicts, &conflicts, 1342 " Uncommittable states such as conflicts, unversioned and missing cannot\n" 1374 " successfully unshelving with no conflicts.\n"
|
H A D | shelf2-cmd.c | 381 unsigned int conflicts; local 390 &conflicts, &conflicts, &conflicts, 1318 " Uncommittable states such as conflicts, unversioned and missing cannot\n" 1350 " successfully unshelving with no conflicts.\n"
|
/freebsd-11-stable/contrib/ntp/ntpd/ |
H A D | ntp_filegen.c | 218 static u_long conflicts = 0; local 234 (int)getpid(), conflicts++);
|
/freebsd-11-stable/usr.sbin/etcupdate/tests/ |
H A D | conflicts_test.sh | 37 echo "Usage: conflicts.sh [-s script] [-w workdir]" 62 CONFLICTS=$WORKDIR/conflicts 67 # These tests deal with conflicts to a single file. For each test, we
|
H A D | ignore_test.sh | 62 CONFLICTS=$WORKDIR/conflicts
|
H A D | preworld_test.sh | 62 CONFLICTS=$WORKDIR/conflicts
|
H A D | tzsetup_test.sh | 62 CONFLICTS=$WORKDIR/conflicts
|
/freebsd-11-stable/usr.sbin/etcupdate/ |
H A D | etcupdate.sh | 49 # with unresolved conflicts after the merge are left in a tree rooted 50 # at WORKDIR/conflicts. 677 # Generate a conflict file when a "new" file conflicts with an 680 # $1 - pathname of the file that conflicts (relative to DESTDIR) 816 # conflicts, the updated file is installed. If the merge fails, the 829 # No conflicts, so just redo the merge to the 844 # the conflicts directory. 872 # resolving conflicts after an update or merge with Perforce or 874 # commands for resolving conflicts with Subversion. 885 # doesn't contain any conflicts [all...] |