===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -c -r1.162 -r1.163
*** src/usr.bin/cvs/cvs.h	2008/03/01 21:29:36	1.162
--- src/usr.bin/cvs/cvs.h	2008/03/08 20:26:34	1.163
***************
*** 1,4 ****
! /*	$OpenBSD: cvs.h,v 1.162 2008/03/01 21:29:36 deraadt Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cvs.h,v 1.163 2008/03/08 20:26:34 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 291,296 ****
--- 291,298 ----
  } CVSENTRIES;
  
  extern char *checkout_target_dir;
+ extern char *cvs_join_rev1;
+ extern char *cvs_join_rev2;
  
  extern struct module_checkout *current_module;
  extern char *module_repo_root;
***************
*** 397,402 ****
--- 399,406 ----
  void	cvs_update_enterdir(struct cvs_file *);
  void	cvs_update_leavedir(struct cvs_file *);
  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 *);
  
  #define CO_MERGE	0x01