diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-08 21:44:33 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-08 21:44:33 +0000 |
| commit | b34db8d928e95e730cdd03e44a6905a713b255ed (patch) | |
| tree | a098d7533c5852d3d9efef421153fd8c6a29a89a /usr.bin/cvs | |
| parent | 35bdf3b1b59c7dc14e9697cdbef99bf39df54a65 (diff) | |
do not override a specified (-r) tag with the tag in the Entries file
Diffstat (limited to 'usr.bin/cvs')
| -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) { |