[Cvs-cvs] Changes to ccvs/src/ChangeLog [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.401 ccvs/src/ChangeLog:1.2336.2.402
--- ccvs/src/ChangeLog:1.2336.2.401     Mon Sep 19 14:37:18 2005
+++ ccvs/src/ChangeLog  Thu Sep 22 18:13:25 2005
@@ -1,3 +1,29 @@
+2005-09-22  Derek Price  <address@hidden>
+
+       * classify.c (Classify_File): If a file had a conflict and the
+       timestamp hasn't changed, it still has a conflict.  Add comment about
+       how T_MODIFIED could later turn out to have conflict markers and why
+       it should not be checked in this function.
+       * client.c (send_fileproc): Don't send contents for files known to have
+       conflicts unless this is for `cvs diff'.
+       * commit.c (check_fileproc): T_CONFLICT should be handled like
+       T_MODIFIED, since force could be requested.  Simplify logic since
+       T_CONFLICT can now be trusted.
+       * cvs.h (file_has_conflict): Remove proto.
+       * rcs.c (RCS_Checkout): Comment noexec behavior in header block.
+       * server.c (serve_unchanged, serve_is_modified): Handle conflicts.
+       * status.c (status_fileproc): Trust T_CONFLICT to simplify.
+       * subr.c (file_has_conflict): Removed.
+       * update.c (update_fileproc): Trust T_CONFLICT.
+       (RegisterMerge): New function factored from...
+       (merge_file, join_file): ...these two functions.
+       * vers_ts.c (time_stamp_server): Handle = conflict timestamps in server
+       entdata.
+       * sanity.sh (files-12): Account for slight behavior improvement.
+       (status, conflicts, mwrap): Account for corrected behavior.
+       (join-readonly-conflict-10): Correct comment.
+       (binfiles-con1b): New test for correct behavior.
+
 2005-09-19  Derek Price  <address@hidden>
 
        * sanity.sh (modules5-8): Rename...