Re: TortoiseMerge - strange behavior

Hello, Stefan!

>> 1) If one deletes a line in working copy (right view), the line is
also
>> deleted in working base (left view).
>>
>> I found it strange - should working base ever be changed?
>
>The base isn't really changed, because it can't be saved.
>The problem is that if we don't remove the lines, the user will get
>confused: when editing a text file and you remove a line, you expect it

>to actually get removed and not just stay there as an empty (but marked

>removed) line. And since we're removing the line on the right view, we
>*must* remove it also on the left view, otherwise the diff becomes
>out-of-sync (line-wise).

Well, I can see that. Though, for me it would be more convenient, if the
line, once removed, would stay empty and marked as removed.
I don't think that TMerge mast act exactly as any other editor.
Though I believe, that other users may have different opinions.

The problem with TMerge is that it removes wrong lines in the left view.

Please consider following scenario:

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

Click the right view to start editing.
Place the text cursor at the very beginning of the file.
Remove the first line, hitting the [del] key twice.
The *second* line in the left view will be removed.

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-18 12:07:08 CET