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

Re: Feature request: TMerge show first difference within a line

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 29 Jan 2010 22:19:32 +0000

On 29 January 2010 19:41, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 29.01.2010 12:03, Simon Large wrote:
>> Hi folks,
>>
>> I'm sure this has come up before, but if you have a file with long
>> lines then the part of the line which has changed is very often
>> outside the view window. It would be good if there were an option to
>> scroll the view so that the first difference is actually visible. I'm
>> not sure whether this should scroll the main windows or just the diff
>> bar. Also, if there are multiple changes within a line then it would
>> be useful to have a key to jump to the next inline difference which is
>> still off screen, but maybe that is going too far.
>>
>> I think the 'Next difference' jump should always show column 1 if
>> possible, so if the first difference scrolls the view to column 300
>> due to a very long line with a change at the end, jump to next
>> difference should try to go back to showing column 1 unless the first
>> difference in that case prevents it.
>
> But often, there a whole block of lines that's different. And the "next
> diff" button selects that whole block.
> What should TMerge do in such a case?
>
> For example, three very long lines are different. The first one doesn't
> show inline diffs because of too many differences. The second one does,
> as does the third one.
>
> now what should the 'next inline diff' button do in this case?

What about just the diff bar: that only shows one line at a time?

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2443190
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-29 23:19:43 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.