[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TortoiseMerge - strange behavior

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 13 Mar 2008 20:13:16 +0100

Gerasimov, Ivan wrote:
> Hello!
> Suppose, one is looking at a locally modified file, compared to its base.
> 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).

> 2) If one switches left/right views, local modifications are lost
> without any warnings.

Fixed in r12335.

> 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?

> 4) And at last: the left view has bigger width by default :-)

Improved in r12336.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-03-13 20:13:31 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.