|
From: | Derek Robert Price |
Subject: | [Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh server.c ... [signed-commits2] |
Date: | Thu, 01 Dec 2005 15:24:39 -0500 |
CVSROOT: /cvsroot/cvs Module name: ccvs Branch: signed-commits2 Changes by: Derek Robert Price <address@hidden> 05/12/01 20:24:02 Modified files: src : ChangeLog client.c sanity.sh server.c update.c Log message: * client.c (client_base_merge): Print `Merging differences' message only when !REALLY_QUIET. (handle_base_merged): New function. (responses): Add Base-merged. * server.c (server_updated): Send Base-merged for merges. * update.c (join_file): Handle replacing files and binaries correctly. * sanity.sh: Compensate for new read-only Base files by forcing some directory removals. Other minor corrections. CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits2&tr1=1.3306.2.31&tr2=1.3306.2.32&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.14&tr2=1.433.4.15&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.23&tr2=1.1095.4.24&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.8&tr2=1.452.2.9&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.9&tr2=1.256.4.10&r1=text&r2=text
[Prev in Thread] | Current Thread | [Next in Thread] |