diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-06-28 13:10:03 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-06-28 13:10:03 +0000 |
| commit | 59484db2af90db8a5dee2c33b78ec789415bc9ec (patch) | |
| tree | 2d821134860c12c1a7318554052bf38c93913008 | |
| parent | a423522db028bb5949faf084a0fdc1c42875d463 (diff) | |
if the user supplied -A only checkout files again if a sticky tag
was in fact set, instead of ALWAYS checking them out no matter what.
spotted & diff tested by naddy@
| -rw-r--r-- | usr.bin/cvs/update.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index d9d34ced74e..75f22360013 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.155 2008/06/19 19:04:59 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.156 2008/06/28 13:10:02 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -459,12 +459,10 @@ cvs_update_local(struct cvs_file *cf) if (cvs_cmdop != CVS_OP_UPDATE) break; - if (cf->file_rcsrev == NULL) + if (reset_tag != 1 && reset_option != 1) break; - if (tag == NULL && cvs_specified_date == -1 && - cvs_directory_date == -1 && !reset_tag && - !reset_option) + if (cf->file_ent != NULL && cf->file_ent->ce_tag == NULL) break; if (cf->file_rcs->rf_dead != 1 && |