Searched refs:incoming_new_file (Results 1 – 1 of 1) sorted by relevance
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_client/ |
| HD | conflicts.c | 7042 apr_file_t *incoming_new_file; in resolve_merge_incoming_added_file_text_merge() local
7055 SVN_ERR(svn_io_open_unique_file3(&incoming_new_file, in resolve_merge_incoming_added_file_text_merge()
7059 incoming_new_stream = svn_stream_from_aprfile2(incoming_new_file, TRUE, in resolve_merge_incoming_added_file_text_merge()
7082 SVN_ERR(svn_io_file_flush(incoming_new_file, scratch_pool)); in resolve_merge_incoming_added_file_text_merge()
7166 apr_file_t *incoming_new_file; in resolve_merge_incoming_added_file_replace_and_merge() local
7222 SVN_ERR(svn_io_open_unique_file3(&incoming_new_file, NULL, wc_tmpdir, in resolve_merge_incoming_added_file_replace_and_merge()
7225 incoming_new_stream = svn_stream_from_aprfile2(incoming_new_file, TRUE, in resolve_merge_incoming_added_file_replace_and_merge()
7231 SVN_ERR(svn_io_file_flush(incoming_new_file, scratch_pool)); in resolve_merge_incoming_added_file_replace_and_merge()
|