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.
Andreas, > the TortoiseCVS list that TortoiseCVS parses for a "C <filename>" but > CVSNT seems to print "warning conflict" in certain circumstances. The text "warning conflict" is not in the 2.5.03 or 2.5.04 source . Can you provide a trace or the EXACT output? The only thing similar I can find is in commit.cpp: warning: file `%s' seems to still contain conflict indicators" There is also this in rcscmds.cpp: "rcsmerge: warning: conflicts during merge\n" That occurs if the call to call_diff3 returns a status of 1. that status comes directly from diff3_run in diff/diff3.c and it seems to mean 'conflicts found'.