cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Derek Robert Price
Subject: [Cvs-cvs] Changes to ccvs/src/ChangeLog [signed-commits2]
Date: Thu, 08 Dec 2005 15:49:47 -0500

Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3306.2.41 ccvs/src/ChangeLog:1.3306.2.42
--- ccvs/src/ChangeLog:1.3306.2.41      Thu Dec  8 15:02:36 2005
+++ ccvs/src/ChangeLog  Thu Dec  8 20:49:43 2005
@@ -1,5 +1,30 @@
 2005-12-08  Derek Price  <address@hidden>
 
+       * Makefile.am (maintainercheck-local, nobaseremotecheck,
+       nobaselocalcheck, nobaseproxycheck): New targets.
+       (check-local): Add nobaseremotecheck.
+       * base.c (base_copy, base_merge): Remove files when bases are
+       suppressed.
+       * checkin.c (Checkin): Don't create bases when suppressed.
+       * client.c (handle_base_checkout, handle_temp_checkout,
+       handle_base_copy, handle_base_merge, handle_base_entry,
+       handle_base_merged): Abort if these responses are received when the
+       client has requested the server not send them.
+       (client_base_copy): Force removal of temp files in noexec mode.
+       (start_server): Avoid sending Base-* and Temp-checkout as part of
+       valid_responses when the user has suppressed these.
+       * cvs.h (NOBASES_ENV): New macro.
+       (suppress_bases): New global.
+       * main.c (bases): Ditto.
+       (opt_usage, short_options, main): Add & process -B.
+       * update.c (join_file): Prefer Register to the potentially ambiguous
+       RegisterMerge when the merge actually only added a file.  Use
+       RCS_cmp_file to test if the file == its base when a base file is not
+       available.
+
+       * sanity.sh: Add processing for -B and -q options.
+       (unedit-without-baserev): Remove accidental commit.
+       
        * base.c (base_checkout): Don't checkout base files when NOEXEC.
        (temp_checkout): New function.
        (base_copy): This function can't rely on the client to validate changes




reply via email to

[Prev in Thread] Current Thread [Next in Thread]