Searched refs:merge_file (Results 1 – 5 of 5) sorted by relevance
| /openbsd/src/gnu/usr.bin/cvs/src/ |
| D | update.c | 60 static int merge_file PROTO ((struct file_info *finfo, Vers_TS *vers));
664 retval = merge_file (finfo, vers);
1969 merge_file (finfo, vers) in merge_file() function
|
| D | ChangeLog-9395 | 2236 * update.c (merge_file, join_file): Call RCS_merge instead of
2654 * update.c (merge_file): My rcsmerge doesn't accept a -E option,
2754 * update.c (merge_file): Don't call xcmp if noexec.
3083 * update.c (merge_file, join_file): Pass -E to rcsmerge.
3084 (merge_file): If rcsmerge doesn't change the file, say so.
3310 (merge_file): Pass new argument to server_updated.
3391 (merge_file): Pass new argument to server_updated.
|
| D | ChangeLog | 2992 (update_fileproc): In case T_NEEDS_MERGE, let merge_file take care
2994 (merge_file): Print "conflicts found in FILE" message
3321 * update.c (merge_file): Use cvs_output for "already contains the
3659 * update.c (merge_file): Warn about failed unlink when not due
3952 * update.c (merge_file): Make sure the time stamp of the file is
4708 (merge_file, join_file): Call it.
4764 * update.c (merge_file): Remove comment about sending file to
4790 (merge_file): Let checkout_file call server_updated.
|
| D | ChangeLog-96 | 1620 * update.c (merge_file): Pass 0 not NULL to checkout_file (20 Jul
2213 * update.c (merge_file): Replace file, repository, entries, and
2217 (merge_file): If -kb is in effect, call it a conflict, leave
2506 (update_fileproc, merge_file, join_file): Pass it.
3733 * update.c (merge_file): Use write_letter not printf.
|
| D | ChangeLog-97 | 1063 * update.c (merge_file, join_file): Update RCS_merge calls.
1480 * update.c (merge_file, join_file): If wrap_merge_is_copy, treat
|