Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Hello Tony, there is definitively a bug in the current build. Conflicts are no longer marked in the CVS/Entries ! The place where I see a solution is src/client.c update_entries(). The patch below fixes the problem for now, but I think the bug is elsewhere. The Test if( ts[0] == '+') has been there for for a long long time. And it was working this way. So I think the Server generated Entries-Line ( read_line (&entries_line);) is wrong. cvs -z9 diff client.c (in directory K:\cvs\cvs_nt\cvsnt\src\) Index: client.c =================================================================== RCS file: /usr/local/cvs/cvsnt/src/client.c,v retrieving revision 1.40.4.5 diff -r1.40.4.5 client.c 1540c1540,1546 < --- > > /* RW -->> */ > ts = strchr( ts, '+'); > if( NULL == ts) > ts = ""; > /* -->> RW */ > -- Best regards, Richard mailto:r.wirth at wirthware.de