version 1.178, 2010/07/23 21:46:05 |
version 1.179, 2010/09/29 18:14:52 |
|
|
extern char *checkout_target_dir; |
extern char *checkout_target_dir; |
extern char *cvs_join_rev1; |
extern char *cvs_join_rev1; |
extern char *cvs_join_rev2; |
extern char *cvs_join_rev2; |
|
extern int backup_local_changes; |
|
|
extern struct module_checkout *current_module; |
extern struct module_checkout *current_module; |
extern char *module_repo_root; |
extern char *module_repo_root; |
|
|
void cvs_remove_local(struct cvs_file *); |
void cvs_remove_local(struct cvs_file *); |
void cvs_add_local(struct cvs_file *); |
void cvs_add_local(struct cvs_file *); |
int update_has_conflict_markers(struct cvs_file *); |
int update_has_conflict_markers(struct cvs_file *); |
|
void cvs_backup_file(struct cvs_file *); |
|
|
#define CO_MERGE 0x01 |
#define CO_MERGE 0x01 |
#define CO_SETSTICKY 0x02 |
#define CO_SETSTICKY 0x02 |