[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/base.h [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/base.h [signed-commits2] |
Date: |
Tue, 29 Nov 2005 18:44:22 -0500 |
Index: ccvs/src/base.h
diff -u ccvs/src/base.h:1.1.2.3 ccvs/src/base.h:1.1.2.4
--- ccvs/src/base.h:1.1.2.3 Tue Nov 22 18:03:44 2005
+++ ccvs/src/base.h Tue Nov 29 23:44:18 2005
@@ -29,7 +29,9 @@
int base_checkout (RCSNode *rcs, struct file_info *finfo,
const char *prev, const char *rev, const char *tag,
- const char *options, bool writable);
-void base_copy (struct file_info *finfo, const char *rev, const char *exists);
+ const char *options);
+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 *options,
+ const char *urev, const char *rev1, const char *rev2);
#endif /* BASE_H */