[Top][All Lists]

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

[Cvs-cvs] Changes to ccvs/NEWS

From: Derek Robert Price
Subject: [Cvs-cvs] Changes to ccvs/NEWS
Date: Thu, 22 Sep 2005 23:19:25 -0400

Index: ccvs/NEWS
diff -u ccvs/NEWS:1.333 ccvs/NEWS:1.334
--- ccvs/NEWS:1.333     Tue Sep  6 15:41:42 2005
+++ ccvs/NEWS   Fri Sep 23 03:19:22 2005
@@ -42,6 +42,14 @@
+* CVS server now handles conflict markers in Entry requests as documented.
+* CVS now remembers that binary file merge conflicts occurred until the
+  timestamp of the updated binary file changes.
+* CVS client now saves some bandwidth by not sending the contents of files
+  with conflicts to the server when it isn't needed.
 * CVS now does correct locking during import.
 * A problem where the server could block indefinitely waiting for an EOF from

reply via email to

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