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.
Arthur Barrett wrote:
> 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?
I will as soon as the problem appears the next time. As said/written in
the TCVS list, I have not (yet) found a way to reproduce the problem.
[snip]
> From memory there are three cases for 'C' conflict:
> 1) when the file can be merged
If the file can be merged, the 'C' does IMHO not appear.
> 2) when the file cannot be merged (usually a binary file)
> 3) when there was a conflict merge in a previous merge or the conflict
> indicators are still in the file
Best regards
Andreas
--
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