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

Re: newline symbol is always the same (TortoiseMerge)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 09 Sep 2013 21:54:16 +0200

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?


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-09 21:54:34 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.