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: Wed, 30 Nov 2005 15:25:40 -0500

Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3306.2.20 ccvs/src/ChangeLog:1.3306.2.21
--- ccvs/src/ChangeLog:1.3306.2.20      Wed Nov 30 19:58:45 2005
+++ ccvs/src/ChangeLog  Wed Nov 30 20:25:38 2005
@@ -1,5 +1,9 @@
 2005-11-30  Derek Price  <address@hidden>
 
+       * update.c (update, do_update): Set bases separately from -u.
+       (merge_file, join_file): Consistently output "already contains the
+       differences" messages when !QUIET.
+
        * server.c (server_base_checkout): Accept poptions argument & resend
        Base files when options have changed.
        * base.c, server.h: Change all references.




reply via email to

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