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 firstname.lastname@example.org.
On Fri, 12 Jul 2002 11:19:05 +0000 (UTC), John.Hall at optionexist.co.uk ("John Hall") wrote: >I have cvsnt 220.127.116.11 (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. > The conflict check isn't perfect, and can miss things - it's up to the developer to check whether a file still has conflicts before committing. It does manage to catch it 95% of the time, though. A worse problem tends to be false positives, where someone has used '>>>>>>>' in a comment. Tony _______________________________________________ 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