From c55bd1fde22d7d1558a234e1b9f927f4f88e19ff Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Wed, 23 Jan 2008 09:34:09 +0000 Subject: Don't reset the sticky tag of a file in CVS/Entries if it is not requested. OK niallo@, xsa@ --- usr.bin/cvs/checkout.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'usr.bin/cvs') diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index ba32136cc61..0923c45620e 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.108 2008/01/21 16:36:46 tobias Exp $ */ +/* $OpenBSD: checkout.c,v 1.109 2008/01/23 09:34:08 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink * @@ -335,6 +335,10 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, char *tag, int co_flags) else (void)xsnprintf(stickytag, sizeof(stickytag), "T%s", rev); + else if (!reset_stickies && cf->file_ent != NULL && + cf->file_ent->ce_tag != NULL) + (void)xsnprintf(stickytag, sizeof(stickytag), "T%s", + cf->file_ent->ce_tag); else stickytag[0] = '\0'; -- cgit v1.2.3