=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v retrieving revision 1.121 retrieving revision 1.122 diff -c -r1.121 -r1.122 *** src/usr.bin/cvs/update.c 2008/02/06 12:42:46 1.121 --- src/usr.bin/cvs/update.c 2008/02/08 21:44:32 1.122 *************** *** 1,4 **** ! /* $OpenBSD: update.c,v 1.121 2008/02/06 12:42:46 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink * --- 1,4 ---- ! /* $OpenBSD: update.c,v 1.122 2008/02/08 21:44:32 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * *************** *** 311,316 **** --- 311,318 ---- 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; *************** *** 318,326 **** 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 && --- 320,325 ----