[Cvs-cvs] ccvs/src ChangeLog Makefile.am Makefile.in add.... [signed-commits2]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits2
Changes by:     Derek Robert Price <address@hidden>     05/11/29 23:44:20

Modified files:
        src            : ChangeLog Makefile.am Makefile.in add.c base.c 
                         base.h checkin.c client.c commit.c cvs.h 
                         filesubr.c filesubr.h rcscmds.c run.h sanity.sh 
                         server.c server.h update.c 
Added files:
        src            : difflib.c difflib.h 

Log message:
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/difflib.c?only_with_tag=signed-commits2&rev=1.1.2.1
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/difflib.h?only_with_tag=signed-commits2&rev=1.1.2.1
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits2&tr1=1.3306.2.14&tr2=1.3306.2.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/Makefile.am.diff?only_with_tag=signed-commits2&tr1=1.47.4.2&tr2=1.47.4.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/Makefile.in.diff?only_with_tag=signed-commits2&tr1=1.160.2.3&tr2=1.160.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/add.c.diff?only_with_tag=signed-commits2&tr1=1.121.4.1&tr2=1.121.4.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/base.c.diff?only_with_tag=signed-commits2&tr1=1.1.2.4&tr2=1.1.2.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/base.h.diff?only_with_tag=signed-commits2&tr1=1.1.2.3&tr2=1.1.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/checkin.c.diff?only_with_tag=signed-commits2&tr1=1.55.6.3&tr2=1.55.6.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/client.c.diff?only_with_tag=signed-commits2&tr1=1.433.4.5&tr2=1.433.4.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/commit.c.diff?only_with_tag=signed-commits2&tr1=1.255.4.3&tr2=1.255.4.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/cvs.h.diff?only_with_tag=signed-commits2&tr1=1.345.2.3&tr2=1.345.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/filesubr.c.diff?only_with_tag=signed-commits2&tr1=1.105.4.1&tr2=1.105.4.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/filesubr.h.diff?only_with_tag=signed-commits2&tr1=1.1.4.1&tr2=1.1.4.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/rcscmds.c.diff?only_with_tag=signed-commits2&tr1=1.72&tr2=1.72.4.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/run.h.diff?only_with_tag=signed-commits2&tr1=1.1.4.1&tr2=1.1.4.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=signed-commits2&tr1=1.1095.4.9&tr2=1.1095.4.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/server.c.diff?only_with_tag=signed-commits2&tr1=1.452.2.5&tr2=1.452.2.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/server.h.diff?only_with_tag=signed-commits2&tr1=1.44.4.4&tr2=1.44.4.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/update.c.diff?only_with_tag=signed-commits2&tr1=1.256.4.3&tr2=1.256.4.4&r1=text&r2=text