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.
I have cvsnt 1.11.1.3 (57f) running on Windows 2000. I just did a commit fr= om Linux which has standard cvs 1.11. As it turned out the big merge I had = just done had a number of conflicts which I had missed (you're only notifie= d of conflicts on stderr, and I had only logged stdout). How was it possible that cvs allowed files with conflicts to be committed? = I had checked for conflicts by doing 'cvs -n up', and none of the files had= a C next to them. Cheers, John -- OptionExist Limited. The Irwin Centre, Scotland Road, Dry Drayton, Cambridge. Tel: +44 (0)1954 211244, Fax: +44 (0)1954 211565 http://www.optionexist.co.uk/ _______________________________________________ Cvsnt mailing list Cvsnt at cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs