diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-02-05 21:49:30 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-02-05 21:49:30 +0000 |
| commit | f7f683ceca550f6597cca0cb7ec610da74cf5fed (patch) | |
| tree | df067300d009d28d0aaab1cbf4fce6d43754b932 /usr.bin/cvs/client.c | |
| parent | c3fa30528edf8e121d2592dfb3b87d963ac515b6 (diff) | |
When server sends CheckedIn use the supplied option and tag -- not the
one already in our CVS/Entries.
OK xsa@
Diffstat (limited to 'usr.bin/cvs/client.c')
| -rw-r--r-- | usr.bin/cvs/client.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c index 0824f4cdb36..52faeebeb49 100644 --- a/usr.bin/cvs/client.c +++ b/usr.bin/cvs/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.99 2008/02/03 18:18:44 tobias Exp $ */ +/* $OpenBSD: client.c,v 1.100 2008/02/05 21:49:29 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -639,8 +639,7 @@ cvs_client_checkedin(char *data) if (newent->ce_tag != NULL) (void)xsnprintf(sticky, sizeof(sticky), "T%s", - ent->ce_tag); - newent->ce_opts = ent->ce_opts; + newent->ce_tag); cvs_ent_free(ent); } |