Re: [TSVN] TortoiseMerge unstable in 1.06, looking for clues

Fernando P. Nájera Cano wrote:
> In my machine it can be reproduced in this way:
>
> Create a text file, write this three lines without quotes:
[snip]
> The second line should have a space at the end. Do not put the quotes.

The space was the step!

> Try to tortoise-diff them... CPU goes to 100% and tortoisemerge hungs.
>
> In TortoiseMerge 1.0.6, Build 1200.
>
> Hope you can find it and fix it. It happens if there are two lines
> which are identical except for an blank space at the end of one of
> them.

Thanks a lot! Finally, after one hour of trying to get TME to hang I was
able to do that. It really only happens under very special circumstances
and combinations of settings.

Fixed in revision 1276.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 25 20:02:49 2004