Home
last modified time | relevance | path

Searched refs:property_state (Results 1 – 3 of 3) sorted by relevance

/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDshelf2.c1400 svn_wc_notify_state_t property_state; in wc_file_merge() local
1419 svn_wc_merge5(&content_outcome, &property_state, ctx->wc_ctx, in wc_file_merge()
1446 svn_wc_notify_state_t property_state; in wc_dir_props_merge() local
1450 svn_wc_merge_props3(&property_state, ctx->wc_ctx, in wc_dir_props_merge()
HDmerge.c2042 svn_wc_notify_state_t property_state; in merge_file_changed() local
2069 property_state = svn_wc_notify_state_unchanged; in merge_file_changed()
2084 SVN_ERR(svn_wc_merge_props3(&property_state, ctx->wc_ctx, local_abspath, in merge_file_changed()
2091 if (property_state == svn_wc_notify_state_conflicted) in merge_file_changed()
2143 SVN_ERR(svn_wc_merge5(&content_outcome, &property_state, ctx->wc_ctx, in merge_file_changed()
2156 || property_state == svn_wc_notify_state_conflicted) in merge_file_changed()
2178 || property_state == svn_wc_notify_state_conflicted in merge_file_changed()
2179 || property_state == svn_wc_notify_state_merged in merge_file_changed()
2180 || property_state == svn_wc_notify_state_changed) in merge_file_changed()
2183 text_state, property_state, in merge_file_changed()
HDconflicts.c7424 svn_wc_notify_state_t property_state; in merge_added_dir_props() local
7453 SVN_ERR(svn_wc_merge_props3(&property_state, ctx->wc_ctx, in merge_added_dir_props()
7471 notify->prop_state = property_state; in merge_added_dir_props()