diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-23 09:34:09 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-01-23 09:34:09 +0000 |
| commit | c55bd1fde22d7d1558a234e1b9f927f4f88e19ff (patch) | |
| tree | ecc91c436f2dea7896982fc7ed97c33ca5baaa0a /usr.bin/cvs | |
| parent | 43db790d2444db5e14f6c14afb176cf515e7a09a (diff) | |
Don't reset the sticky tag of a file in CVS/Entries if it is not requested.
OK niallo@, xsa@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/checkout.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 <joris@openbsd.org> * @@ -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'; |