Searched refs:new_conflict (Results 1 - 4 of 4) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | util.c | 282 svn_wc_conflict_description2_t *new_conflict;
284 new_conflict = apr_pcalloc(pool, sizeof(*new_conflict));
287 *new_conflict = *conflict;
290 new_conflict->local_abspath = apr_pstrdup(pool, conflict->local_abspath);
292 new_conflict->property_name = apr_pstrdup(pool, conflict->property_name);
294 new_conflict->mime_type = apr_pstrdup(pool, conflict->mime_type);
296 new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath);
298 new_conflict->their_abspath = apr_pstrdup(pool, conflict->their_abspath);
300 new_conflict
281 svn_wc_conflict_description2_t *new_conflict; local
362 svn_wc_conflict_description_t *new_conflict; local
[all...] |
| H A D | tree_conflicts.c | 215 svn_wc_conflict_description2_t *new_conflict; local
270 new_conflict = svn_wc_conflict_description_create_tree2(victim_abspath,
273 new_conflict->action = action;
274 new_conflict->reason = reason;
276 *conflict = new_conflict;
|
| H A D | deprecated.c | 3229 svn_wc_conflict_description_t *new_conflict;
3231 new_conflict = apr_pcalloc(pool, sizeof(*new_conflict));
3234 *new_conflict = *conflict;
3237 new_conflict->path = apr_pstrdup(pool, conflict->path);
3239 new_conflict->property_name = apr_pstrdup(pool, conflict->property_name);
3241 new_conflict->mime_type = apr_pstrdup(pool, conflict->mime_type);
3244 new_conflict->base_file = apr_pstrdup(pool, conflict->base_file);
3246 new_conflict->their_file = apr_pstrdup(pool, conflict->their_file);
3248 new_conflict
3228 svn_wc_conflict_description_t *new_conflict; local
[all...] |
| /freebsd-11-stable/usr.sbin/etcupdate/ |
| H A D | etcupdate.sh | 681 new_conflict() function
1159 new_conflict $file
1272 new_conflict $file
|
Completed in 116 milliseconds