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

RE: TortoiseMerge line breaks request

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Thu, 5 May 2011 11:21:43 +0000

>>>> Would it be possible to let TortoiseMerge make a somewhat more
>>>> informed decision on where to break long lines? Right now I see
>>>> some files where a long line is broken differently in the left
>>>> and right pane, and therefore getting a lot of false differences.
...
> I agree, but diffing single looong line is not primary use case, or?

No, but it shows the problems that will pop up with long lines in the middle of a file as well. If you shrink the TortoiseMerge window (for whatever reason) the lines does not have to be all that long at all for the problem to pop up.

>> I would consider it a bug when a line with identical content is
>> broken on different positions in the left and right pane, since
>> it makes the program show differences that aren't there. Agreed?
> I thought about it. It is quite hard question even it does not looks like.
> There is split line you can move. You are saying that when you make left
> view narrow and right wide the small one wins (in term of number of
> chars per line)?

Hmm. Good question. I would spontaneously suggest to disable the splitter and fix it at 50% when "Wrap long lines" is enabled.

Another suggestion would be to just make the whole line-wrapped block behave as a single block when it comes to the diff. That is, show the all the lines that makes up the wrapped lines as changed, if any part of the lines is changed. Not as useful or elegant, but it's a possibility...

>> In addition, I think it would be good if TortoiseMerge could try to
>> make the visualization of broken lines more readable by considering
>> inline difference information (that we already have) when deciding
>> where to break the line.
> Sounds good, however if you add one char - that char should take line?

No. I think that there should be a minimum length requirement. Perhaps 50% of the line width or so.

> or same space should be inserted into other view?

Yes, if it's a new "line" I think there should be a space at the opposite line.

> If second there are different char sizes (KANJI) and same differs in
> size by content nearby (FARSI), so that easy, and readability of such
> expanded text would be heavy affected.

How are those cases handled in the inline diff at the bottom of the TortoiseMerge window? I think we should see the same problems there as well, no?

Hans-Emil

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2730540

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-05 13:21:55 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.