newline symbol is always the same (TortoiseMerge)

[ZTHawk]

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.

I am using tortoiseSVN 1.8.2 x64 with Win7 x64

I posted an issue here:
http://code.google.com/p/tortoisesvn/issues/detail?id=554

I have attached a diff of schiller's text.
additionally I have added a tortoisemerge for a versioned file. I changed a line and added a new line (the hex content of those lines show the kind of newline)

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

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Stefan Küng]

On 09.09.2013 20:50, ZTHawk wrote:
> 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.
>
> I am using tortoiseSVN 1.8.2 x64 with Win7 x64
>
> I posted an issue here:
> http://code.google.com/p/tortoisesvn/issues/detail?id=554
>
> I have attached a diff of schiller's text.
> additionally I have added a tortoisemerge for a versioned file. I changed a line and added a new line (the hex content of those lines show the kind of newline)

This works fine for me here. Tried every setting there is in TMerge, and
it still showed the newline symbols correctly.

Try opening your files with a hex editor and check the newlines there.
Maybe the newlines are as they're shown in TMerge?

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net

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

[ZTHawk]

I have checked with hex editor and they are as posted.
versioned file has 0x0A only.
modified version file has 0x0D 0A and 0x0A.
All of them are displayed as 0x0A.
Sometimes T-Merge does not even show me that there is a diff.

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

[Dan Lasley]

I am seeing the same thing. I imported Windows CR/LF and checkout gives me LF. I thought there was a global setting to select the preference, but I can't seem to find it.

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

[Simon Large]

On 10 September 2013 12:53, Dan Lasley <dla...@milleredge.com> wrote:
> I am seeing the same thing. I imported Windows CR/LF and checkout gives me LF. I thought there was a global setting to select the preference, but I can't seem to find it.

TortoiseMerge -> Settings -> General -> Ignore line endings (recommended)

The default is to ignore any differences in line endings.

However I can confirm some strange behaviour with 1.8.1

Start out with a normal windows-style file and edit in a hex editor to
remove CR on one line. Now all lines have CRLF line endings except
that one which has just LF. Save the file. Subversion does not detect
the change (CLI is the same in this respect). This is strange given
that the file size and timestamp have changed. However, my guess is
that because this file has svn:eol-style set to native that if I were
to commit any other change subversion would silently change the LF
back to CRLF.

Now change a different line and save again.
TSVN and SVN show the file as changed, as expected and I can now diff
with TMerge.
TMerge shows the line ending change provided that 'ignore line
endings' is turned off, but the character used to represent the line
ending is the same in both files, i.e. the bent arrow, so it is not
possible to see why the line is marked as changed without using a hex
editor.

Simon

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

[Stefan Küng]

On 10.09.2013 14:43, Simon Large wrote:
> On 10 September 2013 12:53, Dan Lasley <dla...@milleredge.com> wrote:
>> I am seeing the same thing. I imported Windows CR/LF and checkout gives me LF. I thought there was a global setting to select the preference, but I can't seem to find it.
>
> TortoiseMerge -> Settings -> General -> Ignore line endings (recommended)
>
> The default is to ignore any differences in line endings.
>
> However I can confirm some strange behaviour with 1.8.1
>
> Start out with a normal windows-style file and edit in a hex editor to
> remove CR on one line. Now all lines have CRLF line endings except
> that one which has just LF. Save the file. Subversion does not detect
> the change (CLI is the same in this respect). This is strange given
> that the file size and timestamp have changed. However, my guess is
> that because this file has svn:eol-style set to native that if I were
> to commit any other change subversion would silently change the LF
> back to CRLF.

Actually, no: if you wanted to commit that, you would get an error
"inconsistent line endings" and the commit would abort.
But if you do an update, then the EOLs will be 'fixed' to native (or
whatever you've set with svn:eol-style).

> Now change a different line and save again.
> TSVN and SVN show the file as changed, as expected and I can now diff
> with TMerge.
> TMerge shows the line ending change provided that 'ignore line
> endings' is turned off, but the character used to represent the line
> ending is the same in both files, i.e. the bent arrow, so it is not
> possible to see why the line is marked as changed without using a hex
> editor.

That's very, very strange. Whenever I try this, I can see the different
EOL markers in TMerge.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------

http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064288

[Dan Lasley]

Sorry, I was trying to be clear and failed. I am seeing this with the regular TSVN, not TortoiseMerge.

Import a project with CRLF, and Checkout gives me LF only. I don't see the Settings button for that.

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

[Simon Large]

In case it's relevant I'm seeing this on my XP machine at work. I'll
try it on Win7 when I get home.

Simon

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

[Simon Large]

Same in Win7.

Two text files attached, plus a screenshot.

Simon

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

[Stefan Küng]

And here's how it looks on my machine with your test files.

Stefan


--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------

http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064467

[ZTHawk]

I get the same results as "simonlarge".
(base = Test1.txt and their = Test2.txt)
Is it possible that this issue is a OS + language issue?
I have Win7 x64 (german version)

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

[Dan Lasley]

*bump*

Did we ever get a resolution on this?

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

[Stefan Küng]

On 23.09.2013 15:33, Dan Lasley wrote:
> *bump*
>
> Did we ever get a resolution on this?

http://code.google.com/p/tortoisesvn/issues/detail?id=554

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------

http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3065105

[Dan Lasley]

Thanks!

Nice to know we're not seeing things.

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