diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2006-05-28 01:24:29 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2006-05-28 01:24:29 +0000 |
| commit | 342f3ae6ce1c83fe66ffe451203aa5422a5c55dd (patch) | |
| tree | 6613db867184039df62d338830b35622c738a3dd /usr.bin/cvs/cvs.h | |
| parent | f3cd77e41486334a04b835661b504ca4b4cf799c (diff) | |
enable merging on update. if your file in your working copy
has been modified by yourself and there is a newer revision
we try and merge them together.
if the merge fails and has conflicts it will mark them inside
the file, you will need to resolve these by hand first before
you will be able to commit your modified file.
works transparent with gnu cvs, as it is suppose to.
Diffstat (limited to 'usr.bin/cvs/cvs.h')
| -rw-r--r-- | usr.bin/cvs/cvs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index 19ad84c73c1..41429c40ee4 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.108 2006/05/27 20:57:42 joris Exp $ */ +/* $OpenBSD: cvs.h,v 1.109 2006/05/28 01:24:28 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -347,6 +347,9 @@ void cvsroot_remove(struct cvsroot *); void cvs_update_local(struct cvs_file *); void cvs_update_enterdir(struct cvs_file *); void cvs_update_leavedir(struct cvs_file *); -int cvs_checkout_file(struct cvs_file *, RCSNUM *, int); +void cvs_checkout_file(struct cvs_file *, RCSNUM *, BUF *, int); +int update_has_conflict_markers(struct cvs_file *); + +#define CO_MERGE 0x01 #endif |