summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/remove.c
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-02-04 15:07:34 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-02-04 15:07:34 +0000
commit411b75fbdfa56ff0a00aa9ce3c23e4674c30bcfd (patch)
treeb28e12816c4e0d77510c52ab19889c16ba4e0ecd /usr.bin/cvs/remove.c
parent78441b321b1022d3be5daeabc9c2234895287cee (diff)
Added -k flag support for all commands which support it.
OK joris@
Diffstat (limited to 'usr.bin/cvs/remove.c')
-rw-r--r--usr.bin/cvs/remove.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 026e783c3b0..64f0831ad46 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remove.c,v 1.69 2008/01/31 10:15:05 tobias Exp $ */
+/* $OpenBSD: remove.c,v 1.70 2008/02/04 15:07:33 tobias Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
*
@@ -186,15 +186,16 @@ cvs_remove_local(struct cvs_file *cf)
}
return;
default:
- rcsnum_tostr(cf->file_ent->ce_rev, rbuf,
- sizeof(rbuf));
+ rcsnum_tostr(cf->file_ent->ce_rev, rbuf, sizeof(rbuf));
ctime_r(&cf->file_ent->ce_mtime, tbuf);
tbuf[strcspn(tbuf, "\n")] = '\0';
entry = xmalloc(CVS_ENT_MAXLINELEN);
(void)xsnprintf(entry, CVS_ENT_MAXLINELEN,
- "/%s/-%s/%s//", cf->file_name, rbuf, tbuf);
+ "/%s/-%s/%s/%s/%s", cf->file_name, rbuf, tbuf,
+ cf->file_ent->ce_opts ? : "",
+ cf->file_ent->ce_tag ? : "");
if (cvs_server_active == 1) {
cvs_server_update_entry("Checked-in", cf);