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

Diff of /ccvs/src/ChangeLog

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

revision 1.3273 by scjones, Thu Sep 22 23:26:25 2005 UTC revision 1.3274 by dprice, Fri Sep 23 03:19:22 2005 UTC
# Line 4  Line 4 
4    
5  2005-09-22  Derek Price  <derek@ximbiot.com>  2005-09-22  Derek Price  <derek@ximbiot.com>
6    
7            * classify.c (Classify_File): If a file had a conflict and the
8            timestamp hasn't changed, it still has a conflict.  Add comment about
9            how T_MODIFIED could later turn out to have conflict markers and why
10            it should not be checked in this function.
11            * client.c (send_fileproc): Don't send contents for files known to have
12            conflicts unless this is for `cvs diff'.
13            * commit.c (check_fileproc): T_CONFLICT should be handled like
14            T_MODIFIED, since force could be requested.  Simplify logic since
15            T_CONFLICT can now be trusted.
16            * rcs.c (RCS_Checkout): Comment noexec behavior in header block.
17            * server.c (serve_unchanged, serve_is_modified): Handle conflicts.
18            * status.c (status_fileproc): Trust T_CONFLICT to simplify.
19            * subr.c (file_has_conflict): Removed.
20            * subr.h (file_has_conflict): Remove proto.
21            * update.c (update_fileproc): Trust T_CONFLICT.
22            (RegisterMerge): New function factored from...
23            (merge_file, join_file): ...these two functions.
24            * vers_ts.c (time_stamp_server): Handle = conflict timestamps in server
25            entdata.
26            * sanity.sh (files-12): Account for slight behavior improvement.
27            (status, conflicts, mwrap): Account for corrected behavior.
28            (join-readonly-conflict-10): Correct comment.
29            (binfiles-con1b): New test for correct behavior.
30    
31          * classify.c (Classify_File): Consolidate redundant conditionals.          * classify.c (Classify_File): Consolidate redundant conditionals.
32    
33  2005-09-21  Derek Price  <derek@ximbiot.com>  2005-09-21  Derek Price  <derek@ximbiot.com>

Legend:
Removed from v.1.3273  
changed lines
  Added in v.1.3274

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