On 29 January 2010 22:42, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 29.01.2010 23:39, Simon Large wrote:
>> On 29 January 2010 22:22, Stefan Küng<tortoisesvn_at_gmail.com> wrote:
>>> On 29.01.2010 23:19, Simon Large wrote:
>>>> 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?
>>>
>>> That bar shows the line the mouse pointer hovers over. Not the selected
>>> lines.
>>> How would we change between the mouse hover mode to the 'scroll to the
>>> inline diff' mode?
>>
>> How about if we forget the next diff function and just change the diff
>> bar so that it always tries to show the difference?
>
> Sorry, I don't understand.
> The 'next diff' function is important and I won't remove that. That's a
> function I'm using a *lot*. I don't think you want to remove that either.
Nonono. We're at cross purposes here. I was talking about some sort of
inline diff function which travels along a single line. Forget that
one.
> And having the bar always show the diff, how would that work? Which
> diff? What about a very long line that has a diff at the beginning and
> one at the end so that both don't fit on the bar? Which one should be
> shown? And if we do that and not have the diff bar follow the mouse
> pointer, how would one scroll to the second diff?
When the bar is initially drawn - due to mouse moving over a line or
using the next/prev diff - it is positioned such that the first
difference is visible. The Ctrl-scrollwheel still works. If there is
one at the beginning and one at the end then you just see the first
one. At the moment if there is only a diff at the end you don't see it
at all without scrolling, and if there is a long line you might have
to scroll a long way. Try diffing the mergeinfo properties on TSVN.
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=2443219
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-30 01:43:36 CET