[Cvs-cvs] ccvs ChangeLog NEWS [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     06/06/09 14:38:48

Modified files:
        .              : ChangeLog NEWS 

Log message:
        * NEWS: Note client/server conflict fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.692.2.242&r2=1.692.2.243
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.116.2.151&r2=1.116.2.152

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.692.2.242
retrieving revision 1.692.2.243
diff -u -b -r1.692.2.242 -r1.692.2.243
--- ChangeLog   26 May 2006 04:23:14 -0000      1.692.2.242
+++ ChangeLog   9 Jun 2006 14:38:48 -0000       1.692.2.243
@@ -1,3 +1,7 @@
+2006-06-09  Derek Price  <address@hidden>
+
+       * NEWS: Note client/server conflict fix.
+
 2006-05-25  Derek Price  <address@hidden>
 
        * configure.in: Accept --with-rsh argument to set RSH_DFLT in config.h.

Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.116.2.151
retrieving revision 1.116.2.152
diff -u -b -r1.116.2.151 -r1.116.2.152
--- NEWS        9 Jun 2006 14:14:23 -0000       1.116.2.151
+++ NEWS        9 Jun 2006 14:38:48 -0000       1.116.2.152
@@ -1,11 +1,12 @@
-Changes since 1.11.22:
+Changes since 1.11.21:
 **********************
 
-Changes from 1.11.21 to 1.11.22:
-********************************
-
 BUG FIXES
 
+* The CVS client again correctly reports files with conflicts when using
+  servers running CVS 1.11.20/1.12.12, or earlier (and maybe 3rd party
+  servers).
+
 * The GSSAPI server should now build under HP-UX.
 
 * `cvs rtag' now correctly tags files that have been removed from the trunk.