diff options
| author |   joris <joris@openbsd.org> | 2007-09-23 11:19:24 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2007-09-23 11:19:24 +0000 |
| commit | 5d320860013690b4b63e308d52fc84e44f38585d (patch) | |
| tree | c814aefbdad090ee6f8457e0f198e172a1785fa3 /usr.bin/cvs/commit.c | |
| parent | pass FILE_HAS_FLAG towards the update code so it can identify (diff) | |
| download | wireguard-openbsd-5d320860013690b4b63e308d52fc84e44f38585d.tar.xz wireguard-openbsd-5d320860013690b4b63e308d52fc84e44f38585d.zip | |
make sure when running update -r on existing files to overwrite
the sticky directory tag with it. since -r gets priority.
Diffstat (limited to 'usr.bin/cvs/commit.c')
| -rw-r--r-- | usr.bin/cvs/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 7406c863307..877a6284d71 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.110 2007/09/22 16:01:22 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.111 2007/09/23 11:19:24 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -359,7 +359,7 @@ cvs_commit_local(struct cvs_file *cf) cf->fd = -1; if (cf->file_status != FILE_REMOVED) { - cvs_checkout_file(cf, cf->file_rcs->rf_head, CO_COMMIT); + cvs_checkout_file(cf, cf->file_rcs->rf_head, NULL, CO_COMMIT); } else { entlist = cvs_ent_open(cf->file_wd); cvs_ent_remove(entlist, cf->file_name); |