[cvsnt] "C <filename>" vs "warning: conflict"

Andreas Tscharner andreas.tscharner at metromec.ch
Mon Feb 4 07:00:27 GMT 2008

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 World,

I've noticed that TortoiseCVS does not always show up the "Resolve 
conflict" dialog if a conflict happens during an update. I was told on 
the TortoiseCVS list that TortoiseCVS parses for a "C <filename>" but 
CVSNT seems to print "warning conflict" in certain circumstances.

When does this happen? Is it possible to print the same message in all 
conflict cases?

Best regards
Andreas Tscharner                          andreas.tscharner at metromec.ch
And the beast shall come forth surrounded by a roiling cloud of
vengeance. The house of the unbelievers shall be razed and they shall be
scorched to the earth. Their tags shall blink until the end of days.
                                             -- The Book of Mozilla 12:10

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook