1 |
2005-12-01 Derek Price <derek@ximbiot.com> |
2005-12-01 Derek Price <derek@ximbiot.com> |
2 |
|
|
3 |
|
* client.c (base_merge_rev1, base_merge_rev2, last_merge_no_change): |
4 |
|
New globals. |
5 |
|
(update_entries): Delete merge temp files when not needed. Don't |
6 |
|
ignore merges (only joins), since rev changes. |
7 |
|
(merge): Skip deleting temp files since this function cannot know which |
8 |
|
is needed. |
9 |
|
* edit.c (edit_file): Deal with read-only edit base files. |
10 |
|
|
11 |
* filesubr.c (force_xchmod, ixchmod, force_copy_file): New functions. |
* filesubr.c (force_xchmod, ixchmod, force_copy_file): New functions. |
12 |
(copy_file, xchmod): Wrap the force_* functions. |
(copy_file, xchmod): Wrap the force_* functions. |
13 |
* cvs.h (xchmod): Move proto... |
* cvs.h (xchmod): Move proto... |