[Cvs-cvs] Changes to ccvs/src/ChangeLog [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3306.2.14 ccvs/src/ChangeLog:1.3306.2.15
--- ccvs/src/ChangeLog:1.3306.2.14      Mon Nov 28 18:42:51 2005
+++ ccvs/src/ChangeLog  Tue Nov 29 23:44:18 2005
@@ -1,3 +1,32 @@
+2005-11-29  Derek Price  <address@hidden>
+
+       * Makefile.am (cvs_SOURCES): Add difflib.[ch].
+       * difflib.c, difflib.h: New files with content from...
+       * rcscmds.c: ...here.
+       * base.c (base_checkout): Move writable processing...
+       (base_copy): ...here.
+       (base_merge): New function.
+       * add.c, base.h, checkin.c, update.c: Update all references.
+       * client.c (last_merge, last_merge_conflict): Keep track of whether
+       merges for update_entries.
+       (update_entries): Use merge result.
+       (client_base_copy): Handle new flags.
+       (client_base_merge, handle_base_merge): New functions.
+       (responses): Add "Base-merge" response.
+       * server.h: Move some protos in from...
+       * cvs.h: ...here and move some run.c stuff...
+       * run.h: ...here.
+       * filesubr.c: Reorg headers.
+       * filesubr.h: Give standalone API.  Move copy_file proto from cvs.h.
+       * server.c (server_base_checkout, server_base_copy): Push data to
+       client when done.
+       (server_base_merge): New function.
+       (server_updated): Assume base handling.
+       * update.c (RegisterMerge, merge_file, join_file): Offload merging to
+       client.
+       * add.c, checkin.c, commit.c, update.c: Update all references.
+       * sanity.sh: Misc accomodations.
+
 2005-11-28  Derek Price  <address@hidden>
 
        * sanity.sh (errmsg4): Protect keyword.