diff options
| author |   joris <joris@openbsd.org> | 2008-02-08 21:44:32 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2008-02-08 21:44:32 +0000 |
| commit | 184e2812e71f135f9ed912e14fb1e46fad6c4334 (patch) | |
| tree | f574e1890a654f2c60563a56189d54cc2745bd4f | |
| parent | do not override the specified tag (-r on the command line) with a directory (diff) | |
| download | wireguard-openbsd-184e2812e71f135f9ed912e14fb1e46fad6c4334.tar.xz wireguard-openbsd-184e2812e71f135f9ed912e14fb1e46fad6c4334.zip | |
do not override a specified (-r) tag with the tag in the Entries file
| -rw-r--r-- | usr.bin/cvs/update.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index f7c3f93ea67..7e29e87aa76 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.121 2008/02/06 12:42:46 tobias Exp $ */ +/* $OpenBSD: update.c,v 1.122 2008/02/08 21:44:32 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -311,6 +311,8 @@ cvs_update_local(struct cvs_file *cf) flags = 0; if (cvs_specified_tag != NULL) tag = cvs_specified_tag; + else if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL) + tag = cf->file_ent->ce_tag; else tag = cvs_directory_tag; @@ -319,9 +321,6 @@ cvs_update_local(struct cvs_file *cf) if (kflag) rcs_kwexp_set(cf->file_rcs, kflag); - if (cf->file_ent != NULL && cf->file_ent->ce_tag != NULL) - tag = cf->file_ent->ce_tag; - if ((cf->file_status == FILE_UPTODATE || cf->file_status == FILE_MODIFIED) && cf->file_ent != NULL && cf->file_ent->ce_tag != NULL && reset_stickies == 1) { |