On 2011-06-02 20:32, Stefan Küng wrote:
> On 30.05.2011 10:15, Hans-Emil Skogh wrote:
>
>>> I'll keep monitoring this, maybe I can find out what's wrong with
>>> the locator bar.
>> I think it's easier to see this in a file that consists of only one
>> very long line. I have attached two files that can be used as an
>> example.
> This works correctly. I think the problem you see is that the locator
> bar does not show inline-diff colors, which of course only make sense in
> line-wrap mode (for the locator bar).
>
> It *could* be done so that the locator bar shows those colors too, but
> it could render TMerge unusable because it's a very, very expensive
> function: imagine instead of diffing two files, the diff has to be done
> not just for those files but for every line in those files.
> That works for small files, but if you have a file that's 5MB in size
> (easily done with some xml files), then it's just way too slow.
I'm now trying to implement (file)line-wise inline diff even for wrapped
line as requested in other thread. It is based on inline diff caching. I
wonder if locator bar should display color based on (file) line result
or wrapped line.
Maybe I can add some more data for locatorbar coloring into cache so it
can be usable fast, but not sure what is more userfriendly. If I imagine
full colored locator bar I don't see many advantage - just a mass,
however if I would have one big line with few changes it can be quite
helpful.
Once I finish this I will check if/how to synchronize line wrapping.
After line wrapping synchronizing locator bar wrapped line coloring may
have even more sense. I just would like to know if this feature is good
to have so will implent case in way it can be extented for this easily.
> Stefan
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2756615
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-03 07:03:59 CEST