diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2007-01-03 20:48:27 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2007-01-03 20:48:27 +0000 |
| commit | fa177b4ef88b2396fdb22ed401357905b5463ce7 (patch) | |
| tree | b1974b9da91abd734df6f613b96519c6d4e0e441 /usr.bin/cvs/cvs.h | |
| parent | 29a07ac0edcebf2bef1f74f7d630561df94f5aeb (diff) | |
if we are commiting a file, do not let the server resend it
with an 'Updated' response, seeing as the client will already have the
latest version. Instead, send the correct 'Checked-in' response.
Diffstat (limited to 'usr.bin/cvs/cvs.h')
| -rw-r--r-- | usr.bin/cvs/cvs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index ba3b77f98ce..6b0cca10679 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.124 2006/12/11 07:59:18 xsa Exp $ */ +/* $OpenBSD: cvs.h,v 1.125 2007/01/03 20:48:26 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -362,6 +362,7 @@ int update_has_conflict_markers(struct cvs_file *); #define CO_MERGE 0x01 #define CO_SETSTICKY 0x02 #define CO_DUMP 0x04 +#define CO_COMMIT 0x08 /* commands */ int cvs_add(int, char **); |