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

Re: Issues with editing in TMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-13 11:26:25 CEST

Simon Large wrote:

> If you combine adding and deleting lines, the left and right panes
> become out of sync. In the simplest case you can add a line in the
> right pane and then delete it again, and the right and left panes show
> different lines deleted.

When a line is removed, it is also removed in the other views. Which
means if you later add the line again, in the other views there's now an
empty line.
To 'fix' this, we would either have to run the diff function every time
we add/delete a line (very CPU intensive) or remember all the lines in
the one or two other views when editing (very memory intensive).

I think we should leave this (at least for now). IMHO once you start
editing, you can't expect to have a proper diff shown anymore.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Oct 13 11:26:35 2007

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.