Home
last modified time | relevance | path

Searched refs:new_conflict (Results 1 – 4 of 4) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
HDutil.c281 svn_wc_conflict_description2_t *new_conflict; in svn_wc_conflict_description2_dup() local
283 new_conflict = apr_pcalloc(pool, sizeof(*new_conflict)); in svn_wc_conflict_description2_dup()
286 *new_conflict = *conflict; in svn_wc_conflict_description2_dup()
289 new_conflict->local_abspath = apr_pstrdup(pool, conflict->local_abspath); in svn_wc_conflict_description2_dup()
291 new_conflict->property_name = apr_pstrdup(pool, conflict->property_name); in svn_wc_conflict_description2_dup()
293 new_conflict->mime_type = apr_pstrdup(pool, conflict->mime_type); in svn_wc_conflict_description2_dup()
295 new_conflict->base_abspath = apr_pstrdup(pool, conflict->base_abspath); in svn_wc_conflict_description2_dup()
297 new_conflict->their_abspath = apr_pstrdup(pool, conflict->their_abspath); in svn_wc_conflict_description2_dup()
299 new_conflict->my_abspath = apr_pstrdup(pool, conflict->my_abspath); in svn_wc_conflict_description2_dup()
301 new_conflict->merged_file = apr_pstrdup(pool, conflict->merged_file); in svn_wc_conflict_description2_dup()
[all …]
HDtree_conflicts.c215 svn_wc_conflict_description2_t *new_conflict; in svn_wc__deserialize_conflict() local
270 new_conflict = svn_wc_conflict_description_create_tree2(victim_abspath, in svn_wc__deserialize_conflict()
273 new_conflict->action = action; in svn_wc__deserialize_conflict()
274 new_conflict->reason = reason; in svn_wc__deserialize_conflict()
276 *conflict = new_conflict; in svn_wc__deserialize_conflict()
HDdeprecated.c3228 svn_wc_conflict_description_t *new_conflict; in conflict_description_dup() local
3230 new_conflict = apr_pcalloc(pool, sizeof(*new_conflict)); in conflict_description_dup()
3233 *new_conflict = *conflict; in conflict_description_dup()
3236 new_conflict->path = apr_pstrdup(pool, conflict->path); in conflict_description_dup()
3238 new_conflict->property_name = apr_pstrdup(pool, conflict->property_name); in conflict_description_dup()
3240 new_conflict->mime_type = apr_pstrdup(pool, conflict->mime_type); in conflict_description_dup()
3243 new_conflict->base_file = apr_pstrdup(pool, conflict->base_file); in conflict_description_dup()
3245 new_conflict->their_file = apr_pstrdup(pool, conflict->their_file); in conflict_description_dup()
3247 new_conflict->my_file = apr_pstrdup(pool, conflict->my_file); in conflict_description_dup()
3249 new_conflict->merged_file = apr_pstrdup(pool, conflict->merged_file); in conflict_description_dup()
[all …]
/freebsd-11-stable/usr.sbin/etcupdate/
HDetcupdate.sh681 new_conflict() function
1159 new_conflict $file
1272 new_conflict $file