search

maitrihegde / tortoisesvn

Automatically exported from code.google.com/p/tortoisesvn
0 stars 1 forks source link

newline symbol is always the same (TortoiseMerge) #554

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
All newline symbols are always the same in TortoiseMerge.
The use the symbol for 0x0A.
If I add default windows newline (0x0D 0x0A) and make a diff with unix style 
newline (0x0A) TortoiseMerge will show that there is a difference but they will 
both have the same symbol.

Original issue reported on code.google.com by ZHaw...@googlemail.com on 9 Sep 2013 at 7:22

GoogleCodeExporter commented 9 years ago 
For the reasons described on the issue tracker main page
(http://code.google.com/p/tortoisesvn/wiki/IssueTracker?tm=3)
please do not file issues without being told to do so by
one of the developers on our mailing list users@tortoisesvn.tigris.org or use
the forum for the mailing list here:
http://tortoisesvn.tigris.org/ds/viewForumSummary.do?dsForumId=4061

In accordance with our guidelines I'm closing this issue as NotDiscussed.
Please post your questions to the users@ mailing list before filing an issue.
If one of the developers on the mailing list agrees that your issue is valid,
we will reopen this issue.

That said:
diff these two files
https://tortoisesvn.googlecode.com/svn/trunk/test/mergediff/Schiller'sGlocke_mix
edeol_base.txt

and

https://tortoisesvn.googlecode.com/svn/trunk/test/mergediff/Schiller'sGlocke_mix
edeol_theirs.txt

the newlines are shown correctly as they should be. See attached screenshot.

And that's exactly why you must not create issues before contacting the mailing 
list.

Original comment by tortoisesvn on 9 Sep 2013 at 5:53

Attachments:

GoogleCodeExporter commented 9 years ago 
Reopening the issue, since apparently others have the same problem.
Still can't see it on all my test machines myself though...

Original comment by tortoisesvn on 12 Sep 2013 at 6:24

GoogleCodeExporter commented 9 years ago 
Seems r24353 is the reason I don't see this: it's on trunk, but not on 1.8.x...

Original comment by tortoisesvn on 12 Sep 2013 at 9:17

GoogleCodeExporter commented 9 years ago

Original comment by tortoisesvn on 13 Sep 2013 at 4:33

GoogleCodeExporter commented 9 years ago 
This issue was closed by revision r24761.

Original comment by tortoisesvn on 13 Sep 2013 at 4:40