=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/admin.c,v retrieving revision 1.28 retrieving revision 1.29 diff -c -r1.28 -r1.29 *** src/usr.bin/cvs/admin.c 2006/01/30 17:58:47 1.28 --- src/usr.bin/cvs/admin.c 2006/02/01 08:33:18 1.29 *************** *** 1,4 **** ! /* $OpenBSD: admin.c,v 1.28 2006/01/30 17:58:47 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * Copyright (c) 2005 Joris Vink --- 1,4 ---- ! /* $OpenBSD: admin.c,v 1.29 2006/02/01 08:33:18 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * Copyright (c) 2005 Joris Vink *************** *** 348,373 **** return (0); } ! if (cf->cf_cvstat == CVS_FST_UNKNOWN) { ! if (verbosity > 1) ! cvs_log(LP_WARN, "nothing known about %s", cf->cf_name); return (0); } cvs_file_getpath(cf, fpath, sizeof(fpath)); - cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)); if ((rf = rcs_open(rcspath, RCS_RDWR)) == NULL) fatal("cvs_admin_local: rcs_open `%s': %s", rcspath, rcs_errstr(rcs_errno)); if (!RCS_KWEXP_INVAL(kflag)) ret = rcs_kwexp_set(rf, kflag); if (lkmode != RCS_LOCK_INVAL) ret = rcs_lock_setmode(rf, lkmode); rcs_close(rf); return (0); } --- 348,380 ---- return (0); } ! if (cf->cf_cvstat == CVS_FST_UNKNOWN) return (0); + else if (cf->cf_cvstat == CVS_FST_ADDED) { + cvs_log(LP_WARN, "cannot admin newly added file `%s'", + cf->cf_name); + return (0); } cvs_file_getpath(cf, fpath, sizeof(fpath)); cvs_rcs_getpath(cf, rcspath, sizeof(rcspath)); if ((rf = rcs_open(rcspath, RCS_RDWR)) == NULL) fatal("cvs_admin_local: rcs_open `%s': %s", rcspath, rcs_errstr(rcs_errno)); + if (!(runflags & FLAG_QUIET)) + cvs_printf("RCS file: %s\n", rcspath); + if (!RCS_KWEXP_INVAL(kflag)) ret = rcs_kwexp_set(rf, kflag); if (lkmode != RCS_LOCK_INVAL) ret = rcs_lock_setmode(rf, lkmode); rcs_close(rf); + + if (!(runflags & FLAG_QUIET)) + cvs_printf("done\n"); return (0); }