Searched refs:remains_in_conflict (Results 1 - 4 of 4) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | file-merge.c | 74 svn_boolean_t remains_in_conflict; member in struct:file_merge_baton
753 merge_file_chunks(svn_boolean_t *remains_in_conflict, argument
791 *remains_in_conflict = TRUE;
833 SVN_ERR(merge_file_chunks(&b->remains_in_conflict,
860 svn_cl__merge_file(svn_boolean_t *remains_in_conflict, argument
921 fmb.remains_in_conflict = FALSE;
936 if (remains_in_conflict)
937 *remains_in_conflict = TRUE;
972 if (remains_in_conflict)
973 *remains_in_conflict
[all...] |
| H A D | conflict-callbacks.c | 1074 svn_boolean_t remains_in_conflict = TRUE;
1078 SVN_ERR(svn_cl__merge_file(&remains_in_conflict,
1090 knows_something = !remains_in_conflict;
1156 svn_boolean_t remains_in_conflict = TRUE;
1158 SVN_ERR(svn_cl__merge_file(&remains_in_conflict,
1171 if (!remains_in_conflict)
2203 svn_boolean_t remains_in_conflict;
2209 &remains_in_conflict,
2226 if (remains_in_conflict)
1073 svn_boolean_t remains_in_conflict = TRUE; local
1155 svn_boolean_t remains_in_conflict = TRUE; local
2202 svn_boolean_t remains_in_conflict; local
|
| H A D | cl.h | 669 svn_boolean_t *remains_in_conflict,
675 svn_cl__merge_file(svn_boolean_t *remains_in_conflict,
|
| H A D | util.c | 118 svn_boolean_t *remains_in_conflict,
184 else if (remains_in_conflict)
185 *remains_in_conflict = exitcode == 1;
110 svn_cl__merge_file_externally(const char *base_path, const char *their_path, const char *my_path, const char *merged_path, const char *wc_path, apr_hash_t *config, svn_boolean_t *remains_in_conflict, apr_pool_t *pool) argument
|
Completed in 72 milliseconds