=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.h,v retrieving revision 1.178 retrieving revision 1.179 diff -c -r1.178 -r1.179 *** src/usr.bin/cvs/cvs.h 2010/07/23 21:46:05 1.178 --- src/usr.bin/cvs/cvs.h 2010/09/29 18:14:52 1.179 *************** *** 1,4 **** ! /* $OpenBSD: cvs.h,v 1.178 2010/07/23 21:46:05 ray Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: cvs.h,v 1.179 2010/09/29 18:14:52 nicm Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau * All rights reserved. *************** *** 274,279 **** --- 274,280 ---- 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,393 **** --- 389,395 ---- 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