/[cvs]/ccvs/src/ChangeLog
ViewVC logotype

Diff of /ccvs/src/ChangeLog

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3306.2.30 by dprice, Thu Dec 1 15:58:43 2005 UTC revision 1.3306.2.31 by dprice, Thu Dec 1 18:45:15 2005 UTC
# Line 1  Line 1 
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...

Legend:
Removed from v.1.3306.2.30  
changed lines
  Added in v.1.3306.2.31

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26