Home
last modified time | relevance | path

Searched refs:join_file (Results 1 – 6 of 6) sorted by relevance

/openbsd-src/gnu/usr.bin/cvs/src/
H A DChangeLog-9194376 (join_file): remove unused variables rev & baserev. Fix a typo.
467 * update.c (join_file): add entries list to calling
472 (join_file): support joins of dead files against live ones, live
H A Dupdate.c76 static void join_file PROTO ((struct file_info *finfo, Vers_TS *vers_ts));
799 join_file (finfo, vers);
2143 join_file (finfo, vers) in join_file() function
H A DChangeLog-9395690 * update.c (join_file): if vers->vn_user is "0", file has been
1076 * update.c (join_file): encapsulate recent changes from garyo
1107 * update.c (join_file): send file back to client even if no
1401 * update.c (join_file): Print a message in the case where the file
1690 * update.c (join_file): If vers->vn_user is NULL, just return.
2236 * update.c (merge_file, join_file): Call RCS_merge instead of
2607 * update.c (join_file): Don't pass the -E option to rcsmerge here,
2812 * update.c (join_file): When checking for null return from
2822 * update.c (join_file): If server and file is unmodified, check it
2827 * update.c (update_file_proc, join_file): Call it.
[all …]
H A DChangeLog-96792 (join_file): supply new argument to RCS_checkout.
1085 * update.c (join_file): Likewise.
1508 * update.c (join_file): If merging a branch, and the branch
1625 * update.c (join_file): Check whether the target of the merge is
1634 (join_file): Remove resurrecting parameter. Rewrite to handle
1693 * update.c (join_file): Always skip rcsmerge if the two revisions
2140 (join_file, checkout_file, patch_file), no_diff.c
2204 (join_file): Add checks to skip merging a dead revision onto a
2506 (update_fileproc, merge_file, join_file): Pass it.
2643 (join_file): New arg resurrecting. Register with "0" if we are
[all …]
H A DChangeLog793 (join_file): add a trace, save the revision to Register() on a remove
911 * update.c (join_file): Restore the original value of `options'
1192 * update.c (join_file): Rename global-shadowing local `options'
1515 * update.c (join_file): When registering the result of the merge,
1519 * update.c (join_file): Correct diagnostics (previous change was not
1675 * update.c (join_file): Correct typo in diagnostic:
3941 (join_file): Likewise. Always register a merged file, not just
3954 (join_file): Likewise.
4708 (merge_file, join_file): Call it.
4791 (join_file): Likewise.
H A DChangeLog-9774 * update.c: Collapse two identical declarations for join_file.
1063 * update.c (merge_file, join_file): Update RCS_merge calls.
1480 * update.c (merge_file, join_file): If wrap_merge_is_copy, treat
1482 (join_file, update_fileproc): Remove previous wrap_merge_is_copy
1700 * update.c (join_file): Handle binary files ourself rather than