Searched refs:conflict (Results 1 - 25 of 103) sorted by relevance

12345

/freebsd-10.3-release/contrib/subversion/subversion/svn/
H A Dcl-conflicts.h46 * description of a property conflict described by @a conflict.
53 const svn_wc_conflict_description2_t *conflict,
58 * description of a tree conflict described by @a conflict.
65 const svn_wc_conflict_description2_t *conflict,
69 * Append to @a str an XML representation of the conflict data
70 * for @a conflict, in a format suitable for 'svn info --xml'.
75 const svn_wc_conflict_description2_t *conflict,
H A Dcl-conflicts.c69 /* Return a localised string representation of the local part of a conflict;
131 conflict; NULL for non-localised odd cases. */
172 conflict. */
190 const svn_wc_conflict_description2_t *conflict,
197 switch (conflict->reason)
214 conflict->reason));
217 switch (conflict->action)
231 conflict->action));
237 operation_str(conflict->operation));
244 const svn_wc_conflict_description2_t *conflict,
188 svn_cl__get_human_readable_prop_conflict_description( const char **desc, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
242 svn_cl__get_human_readable_tree_conflict_description( const char **desc, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
333 append_tree_conflict_info_xml(svn_stringbuf_t *str, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
379 svn_cl__append_conflict_info_xml(svn_stringbuf_t *str, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dinfo-cmd.c241 const svn_wc_conflict_description2_t *conflict =
245 SVN_ERR(svn_cl__append_conflict_info_xml(sb, conflict, pool));
448 const svn_wc_conflict_description2_t *conflict =
453 switch (conflict->kind)
456 if (conflict->base_abspath)
460 path_prefix, conflict->base_abspath,
463 if (conflict->my_abspath)
467 path_prefix, conflict->my_abspath,
470 if (conflict->their_abspath)
474 path_prefix, conflict
239 const svn_wc_conflict_description2_t *conflict = local
446 const svn_wc_conflict_description2_t *conflict = local
503 const svn_wc_conflict_description2_t *conflict = local
[all...]
/freebsd-10.3-release/contrib/subversion/subversion/libsvn_wc/
H A Dutil.c196 svn_wc_conflict_description2_t *conflict;
200 conflict = apr_pcalloc(result_pool, sizeof(*conflict));
201 conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
202 conflict->node_kind = svn_node_file;
203 conflict->kind = svn_wc_conflict_kind_text;
204 conflict->action = svn_wc_conflict_action_edit;
205 conflict->reason = svn_wc_conflict_reason_edited;
206 return conflict;
215 svn_wc_conflict_description2_t *conflict;
195 svn_wc_conflict_description2_t *conflict; local
214 svn_wc_conflict_description2_t *conflict; local
235 svn_wc_conflict_description2_t *conflict; local
253 svn_wc__conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
344 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool) argument
[all...]
H A Dtree_conflicts.h46 * Each tree conflict is identified by the path of the file
48 * We call this file or directory the "victim" of the tree conflict.
51 * modified by the user is a victim of a tree conflict.
53 * For now, tree conflict victims are always direct children of the
54 * directory in which the tree conflict is recorded.
57 * If a directory has tree conflicts, the "tree-conflict-data" field
58 * in the entry for the directory contains one or more tree conflict
65 const svn_wc_conflict_description2_t *conflict,
76 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict,
H A Dtree_conflicts.c2 * tree_conflicts.c: Storage of tree conflict descriptions in the WC.
108 || !svn_skel__matches_atom(skel->children, "conflict"))
136 _("Unknown enumeration value in tree conflict "
145 /* Parse the conflict info fields from SKEL into *VERSION_INFO. */
160 _("Invalid version info in tree conflict "
199 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict, argument
218 _("Invalid conflict info '%s' in tree conflict "
229 _("Empty 'victim' field in tree conflict "
237 _("Invalid 'node_kind' field in tree conflict descriptio
331 svn_wc__serialize_conflict(svn_skel_t **skel, const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
403 svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dwc_db.h415 If CONFLICT is not NULL, then it describes a conflict for this node. The
447 const svn_skel_t *conflict,
469 svn_skel_t *conflict,
492 If CONFLICT is not NULL, then it describes a conflict for this node. The
528 const svn_skel_t *conflict,
550 If CONFLICT is not NULL, then it describes a conflict for this node. The
611 const svn_skel_t *conflict,
628 If CONFLICT is not NULL, then it describes a conflict for this node. The
645 const svn_skel_t *conflict,
659 If CONFLICT is not NULL, then it describes a conflict fo
[all...]
H A Ddeprecated.c2482 const svn_wc_conflict_description2_t *conflict,
2488 svn_wc_conflict_description_t *cd = svn_wc__cd2_to_cd(conflict,
2951 conflict_description_dup(const svn_wc_conflict_description_t *conflict,
2959 *new_conflict = *conflict;
2961 if (conflict->path)
2962 new_conflict->path = apr_pstrdup(pool, conflict->path);
2963 if (conflict->property_name)
2964 new_conflict->property_name = apr_pstrdup(pool, conflict->property_name);
2965 if (conflict->mime_type)
2966 new_conflict->mime_type = apr_pstrdup(pool, conflict
2480 conflict_func_1to2_wrapper(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2950 conflict_description_dup(const svn_wc_conflict_description_t *conflict, apr_pool_t *pool) argument
4422 svn_wc_conflict_description_t *conflict; local
4441 svn_wc_conflict_description_t *conflict; local
4462 svn_wc_conflict_description_t *conflict; local
[all...]
/freebsd-10.3-release/contrib/ntp/ntpd/
H A Dntpd-opts.h164 # warning undefining IPV4 due to option name conflict
168 # warning undefining IPV6 due to option name conflict
172 # warning undefining AUTHREQ due to option name conflict
176 # warning undefining AUTHNOREQ due to option name conflict
180 # warning undefining BCASTSYNC due to option name conflict
184 # warning undefining CONFIGFILE due to option name conflict
188 # warning undefining DEBUG_LEVEL due to option name conflict
192 # warning undefining SET_DEBUG_LEVEL due to option name conflict
196 # warning undefining DRIFTFILE due to option name conflict
200 # warning undefining PANICGATE due to option name conflict
[all...]
/freebsd-10.3-release/usr.sbin/etcupdate/tests/
H A Dfbsdid_test.sh132 # conflict: Modify a file where the local file has a different
133 # FreeBSD ID string. This should still generate a conflict
135 store_id $OLD/conflict ": head/conflict 12000 jhb "
136 store_id $NEW/conflict ": head/conflict 12345 jhb "
137 store_id $TEST/conflict ""
138 cat >> $OLD/conflict <<EOF
142 cat >> $NEW/conflict <<EOF
146 cat >> $TEST/conflict <<EO
257 conflict() function
[all...]
H A Dalways_test.sh87 # What follows are the various warning/conflict cases from the
144 # generate a new link conflict.
152 # This should generate a new file conflict.
190 # to the new file if possible. If the merge fails, a conflict
192 # conflict case.
193 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
196 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
199 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
206 # /adddir/conflict: Add a new file in a directory that already
208 mkdir $NEW/adddir/conflict
355 conflict() function
[all...]
H A Dtests_test.sh311 # generate a new link conflict.
319 # This should generate a new file conflict.
432 # to the new file if possible. If the merge fails, a conflict
447 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
450 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
453 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
465 # /adddir/conflict: Add a new file in a directory that already
467 mkdir $NEW/adddir/conflict
468 touch $NEW/adddir/conflict/newfile
469 touch $TEST/adddir/conflict
733 conflict() function
[all...]
H A Dconflicts_test.sh68 # generate a conflict in /etc/login.conf. Each resolve option is tested
76 # Generate a conflict in /etc/login.conf.
103 # Generate a conflict in /etc/mail/aliases
176 # $1 - relative path to a regular file that should have a conflict
177 # $2 - optional MD5 of the conflict file contents
178 conflict() function
183 echo "File $1 missing conflict"
194 # $1 - relative path to a regular file that should no longer have a conflict
222 conflict /etc/login.conf
224 # Verify that 'mf' removes the conflict, bu
[all...]
/freebsd-10.3-release/contrib/ntp/util/
H A Dntp-keygen-opts.h153 # warning undefining IMBITS due to option name conflict
157 # warning undefining CERTIFICATE due to option name conflict
161 # warning undefining CIPHER due to option name conflict
165 # warning undefining DEBUG_LEVEL due to option name conflict
169 # warning undefining SET_DEBUG_LEVEL due to option name conflict
173 # warning undefining ID_KEY due to option name conflict
177 # warning undefining GQ_PARAMS due to option name conflict
181 # warning undefining HOST_KEY due to option name conflict
185 # warning undefining IFFKEY due to option name conflict
189 # warning undefining IDENT due to option name conflict
[all...]
/freebsd-10.3-release/contrib/ntp/sntp/
H A Dsntp-opts.h150 # warning undefining IPV4 due to option name conflict
154 # warning undefining IPV6 due to option name conflict
158 # warning undefining AUTHENTICATION due to option name conflict
162 # warning undefining BROADCAST due to option name conflict
166 # warning undefining CONCURRENT due to option name conflict
170 # warning undefining DEBUG_LEVEL due to option name conflict
174 # warning undefining SET_DEBUG_LEVEL due to option name conflict
178 # warning undefining GAP due to option name conflict
182 # warning undefining KOD due to option name conflict
186 # warning undefining KEYFILE due to option name conflict
[all...]
/freebsd-10.3-release/contrib/ntp/ntpq/
H A Dntpq-opts.h143 # warning undefining IPV4 due to option name conflict
147 # warning undefining IPV6 due to option name conflict
151 # warning undefining COMMAND due to option name conflict
155 # warning undefining DEBUG_LEVEL due to option name conflict
159 # warning undefining SET_DEBUG_LEVEL due to option name conflict
163 # warning undefining INTERACTIVE due to option name conflict
167 # warning undefining NUMERIC due to option name conflict
171 # warning undefining OLD_RV due to option name conflict
175 # warning undefining PEERS due to option name conflict
179 # warning undefining REFID due to option name conflict
[all...]
/freebsd-10.3-release/contrib/ntp/ntpdc/
H A Dntpdc-opts.h142 # warning undefining IPV4 due to option name conflict
146 # warning undefining IPV6 due to option name conflict
150 # warning undefining COMMAND due to option name conflict
154 # warning undefining DEBUG_LEVEL due to option name conflict
158 # warning undefining SET_DEBUG_LEVEL due to option name conflict
162 # warning undefining INTERACTIVE due to option name conflict
166 # warning undefining LISTPEERS due to option name conflict
170 # warning undefining NUMERIC due to option name conflict
174 # warning undefining PEERS due to option name conflict
178 # warning undefining SHOWPEERS due to option name conflict
[all...]
/freebsd-10.3-release/contrib/subversion/subversion/libsvn_client/
H A Dctx.c56 const svn_wc_conflict_description2_t *conflict,
67 cd = svn_wc__cd2_to_cd(conflict, scratch_pool);
53 call_conflict_func(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
/freebsd-10.3-release/gnu/usr.bin/rcs/lib/
H A Dpartime.c641 * If there is no conflict, merge into *T the additional information in *U
645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
647 conflict (t->tm.tm_sec, u->tm.tm_sec) ||
648 conflict (t->tm.tm_min, u->tm.tm_min) ||
649 conflict (t->tm.tm_hour, u->tm.tm_hour) ||
650 conflict (t->tm.tm_mday, u->tm.tm_mday) ||
651 conflict (t->tm.tm_mon, u->tm.tm_mon) ||
652 conflict (t->tm.tm_year, u->tm.tm_year) ||
653 conflict (t->tm.tm_wday, u->tm.tm_yday) ||
654 conflict (
663 # undef conflict macro
[all...]
/freebsd-10.3-release/contrib/ntp/ntpsnmpd/
H A Dntpsnmpd-opts.h135 # warning undefining NOFORK due to option name conflict
139 # warning undefining SYSLOG due to option name conflict
143 # warning undefining AGENTXSOCKET due to option name conflict
/freebsd-10.3-release/crypto/openssl/crypto/engine/
H A Deng_list.c104 int conflict = 0; local
112 while (iterator && !conflict) {
113 conflict = (strcmp(iterator->id, e->id) == 0);
116 if (conflict) {
/freebsd-10.3-release/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/
H A Dtst.entryreturn.ksh54 * the conflict with a reserved word.
/freebsd-10.3-release/contrib/opie/
H A Dconfigure2653 which can conflict with char $ac_func(); below. */
2873 which can conflict with char $ac_func(); below. */
2979 which can conflict with char $ac_func(); below. */
3036 which can conflict with char atexit(); below. */
3087 which can conflict with char $ac_func(); below. */
3142 which can conflict with char endutent(); below. */
3194 which can conflict with char initgroups(); below. */
3246 which can conflict with char memcmp(); below. */
3298 which can conflict with char memcpy(); below. */
3349 which can conflict wit
[all...]
/freebsd-10.3-release/contrib/diff/src/
H A Ddiff3.c1498 bool conflict;
1515 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break;
1516 case DIFF_3RD: if (overlap_only) continue; conflict = false; break;
1517 case DIFF_ALL: if (simple_only) continue; conflict = flagging; break;
1523 if (conflict)
1528 /* Mark end of conflict. */
1550 /* Mark start of conflict. */
1615 bool conflict;
1632 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break;
1633 case DIFF_3RD: if (overlap_only) continue; conflict
1494 bool conflict; local
1611 bool conflict; local
[all...]
/freebsd-10.3-release/contrib/bmake/mk/
H A Dwhats.mk38 # a unique name that won't conflict with anything

Completed in 388 milliseconds

12345