On 2013-03-09 15:32, Stefan Küng wrote:
> On 09.03.2013 13:17, Geert Mys wrote:
>> Environment: Windows 7 64bit TortoiseGit 1.8.1.0 Open
>> TortoiseGitMerge with the 2 php-files attached. At byte 0x406 a 0x0A
>> character is found not preceded by 0x0D in login2-0000.php. GitMerge
>> fails to show the lines at the same as indicated in the jpg file send
>> (see red line).
> But byte 0x406 is at line 45, not 59/60. And that change is indicated if
> you activate "show whitespaces": then the EOLs are shown. On the left
> side (login2-0000000.php) the EOL is only an LF, indicated by a vertical
> arrow. On the right side the EOL is CRLF, indicated by a _| style arrow.
> That's how it's supposed to work. If you want to see diffs in EOL as
> well, either activate "show whitespaces" or you can even uncheck the
> option "ignore line endings (recommended)" in the settings dialog.
>
> However, the line you indicated in the screenshot (line 59/60), that's
> also correct, well kind of.
> But I can see why this is confusing, I'll try to change this.
I wanted to address this bug about month ago but I have no time to do that.
I have seen your fix however I think that the real bug is that
TortoiseMerge supports EOL_LFCR while svn do not. We use svn_diff to
compare files and we don't always reformat files in this case? Once
little bit less busy I plan to investigate this matter.
I guess It would be better to compare lines as are preparsed by
TortoiseMerge, but when I tried that it was bad performing - maybe you
remember.
>
> Stefan
>
--
Oto ot(ik) BREZINA - 오토 브레지너
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3050701
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-03-09 21:57:58 CET