summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/cvs.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/cvs/cvs.h')
-rw-r--r--usr.bin/cvs/cvs.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index bbb9aa0bf47..ba74fdf691e 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.h,v 1.178 2010/07/23 21:46:05 ray Exp $ */
+/* $OpenBSD: cvs.h,v 1.179 2010/09/29 18:14:52 nicm Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -274,6 +274,7 @@ typedef struct cvs_entries {
extern char *checkout_target_dir;
extern char *cvs_join_rev1;
extern char *cvs_join_rev2;
+extern int backup_local_changes;
extern struct module_checkout *current_module;
extern char *module_repo_root;
@@ -388,6 +389,7 @@ void cvs_checkout_file(struct cvs_file *, RCSNUM *, char *, int);
void cvs_remove_local(struct cvs_file *);
void cvs_add_local(struct cvs_file *);
int update_has_conflict_markers(struct cvs_file *);
+void cvs_backup_file(struct cvs_file *);
#define CO_MERGE 0x01
#define CO_SETSTICKY 0x02