[Cvs-cvs] Changes to ccvs/src/base.h [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/base.h
diff -u ccvs/src/base.h:1.1.2.6 ccvs/src/base.h:1.1.2.7
--- ccvs/src/base.h:1.1.2.6     Fri Dec  2 21:12:44 2005
+++ ccvs/src/base.h     Thu Dec  8 15:02:36 2005
@@ -21,6 +21,17 @@
 
 #include "rcs.h"
 
+enum update_existing {
+    /* We are replacing an existing file.  */
+    UPDATE_ENTRIES_EXISTING,
+    /* We are creating a new file.  */
+    UPDATE_ENTRIES_NEW,
+    /* We don't know whether it is existing or new.  */
+    UPDATE_ENTRIES_EXISTING_OR_NEW
+};
+
+
+
 char *make_base_file_name (const char *filename, const char *rev);
 
 char *base_get (const char *update_dir, const char *file);
@@ -30,9 +41,13 @@
 int base_checkout (RCSNode *rcs, struct file_info *finfo,
                   const char *prev, const char *rev, const char *ptag,
                   const char *tag, const char *poptions, const char *options);
+enum update_existing translate_exists (const char *exists);
+bool validate_change (enum update_existing existp, const char *filename,
+                     const char *fullname);
 void base_copy (struct file_info *finfo, const char *rev, const char *flags);
 void base_remove (const char *file, const char *rev);
 int base_merge (RCSNode *rcs, struct file_info *finfo, const char *ptag,
                const char *poptions, const char *options,
-               const char *urev, const char *rev1, const char *rev2);
+               const char *urev, const char *rev1, const char *rev2,
+               bool join);
 #endif /* BASE_H */