diff options
| author |   joris <joris@openbsd.org> | 2007-01-28 23:39:42 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2007-01-28 23:39:42 +0000 |
| commit | caebe7bca8014f761d519417e567a0d1b090df3b (patch) | |
| tree | ef51ff131f57de28304d2daa1a5e415c0da41d5b | |
| parent | do not overwrite a file that is modified but has a sticky tag set (diff) | |
| download | wireguard-openbsd-caebe7bca8014f761d519417e567a0d1b090df3b.tar.xz wireguard-openbsd-caebe7bca8014f761d519417e567a0d1b090df3b.zip | |
hey look, i found another debug printf from my merging stuff!
kill-zap-nuke-remove-delete it.
| -rw-r--r-- | usr.bin/cvs/checkout.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index 94553a4630c..f46a1094195 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.87 2007/01/28 02:04:45 joris Exp $ */ +/* $OpenBSD: checkout.c,v 1.88 2007/01/28 23:39:42 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -226,9 +226,6 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, int co_flags) return; } - if (co_flags & CO_MERGE) - printf("merge on %s\n", cf->file_path); - if (cvs_server_active == 0) { if (!(co_flags & CO_MERGE)) { oflags = O_WRONLY | O_TRUNC; |