Re: TortoiseMerge - strange behavior

Hi, Stefan!

Forgot to mention, that's the version I'm using is
TortoiseSVN 1.5.0, Build 12222 - 32 Bit -alpha1, 2008/03/01 09:06:45

>> 3) If one selects a text block that contains both modified and
>> unmodified lines and selects "use both text blocks" , result looks
ugly:
>> numbering of lines becomes wrong, added/modified/unmodified lines
aren't
>> marked appropriate.
>>
>> See attached pictures for examples.
>
>Can't reproduce that. If I choose "use both (this first)" or "use both
> (this last)" the line numbers are still correct.
>Are you using the latest version? Does it happen with all your files or

>just a special one?

It happens with all my text files.
Did you select *both modified and unmodified* lines, as I mentioned?

The simplest receipt I found is:

# echo text > c:\file.txt
# TortoiseMerge.exe /base:c:\file.txt /mine:c:\file.txt

Now, selecting the only line and doing "use both text blocks" spoils
line numbering.

Sincerely yours,
Ivan Gerasimov

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-03-17 09:01:59 CET