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

TortoiseMerge - strange behavior

From: Gerasimov, Ivan <Ivan.Gerasimov_at_transas.com>
Date: Thu, 13 Mar 2008 18:17:22 +0300

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?

 

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

 

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.

 

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

 

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

tmerge1.PNG
tmerge2.PNG
Received on 2008-03-13 16:17:56 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.