SVN Checkout with Tortoise SVN

SVN Checkout with Tortoise SVN

Postby sj04736 » 26 Jul 2011, 07:01

Does anyone here happen to know how I can set up TortoiseSVN so that it will checkout latest trunk properly? The files hacienda/track.xml, snowtuxpeak/track.xml and zengarden/track.xml do not seem to checkout properly. With some help on IRC, I've narrowed down the issue to TortoiseSVN not copying the SVN properties from the repository (so svn:eol-type=native - writing from memory, it's something like that - isn't copied). How do I make TortoiseSVN export this properly?
Note: it works fine in `svn update` from cygwin, so I think I just have TortoiseSVN configured wrong?
Stephen
Role: STK-Addons Developer

Image
User avatar
sj04736
 
Posts: 146
Joined: 07 Dec 2009, 02:56
Location: Western Canada

Re: SVN Checkout with Tortoise SVN

Postby hiker » 26 Jul 2011, 07:11

Quick additional info: the files were recently converted to be in Unicode. But it looks like the LF sequences (0a 00) were replaced with windows style sequences (0d 0a, not 0d 00 0a 00 or so).

Cheers,
Joerg
hiker
 
Posts: 1435
Joined: 07 Dec 2009, 12:15
Location: Melbourne, Australia

Re: SVN Checkout with Tortoise SVN

Postby Auria » 27 Jul 2011, 01:02

Hmm, maybe we should remove the native-endline properties altogether (/me is a fan of using \n everywhere)
Image
User avatar
Auria
STK Moderator
 
Posts: 2976
Joined: 07 Dec 2009, 03:52

Re: SVN Checkout with Tortoise SVN

Postby hiker » 27 Jul 2011, 05:30

Auria {l Wrote}:Hmm, maybe we should remove the native-endline properties altogether (/me is a fan of using \n everywhere)

I don't think the problem is actually related to the properties: I have (on cygwin) set *.xml to be native EOL style, but still the unicode files checked out have '0a00' as EOL, so they are not converted to native. Same for all my ascii source files now that I look at it.

With using the command line interface everything works. I had a quick look at tortoise, and it has its own config file. I tried to add the rules for *.xml, and even set the EOL style to be LF, but still tortoise added the '0d' bytes. So somehow it is assuming that the file is a plain text file, which should be converted to native (and yes, I did enable the enable-auto-props setting). Then again, I am not sure if the auto-prop applies if I just remove a file and check it out again (since the svn docs mention that this only applies to newly added or imported files, which I didn't test).

So - no good idea atm, except for using the command line.

Any other tortoise users here? Or can anyone recommend any other GUI for svn on windows?

Cheers,
Joerg
hiker
 
Posts: 1435
Joined: 07 Dec 2009, 12:15
Location: Melbourne, Australia

Re: SVN Checkout with Tortoise SVN

Postby hiker » 28 Jul 2011, 03:15

Hi,

I think we found the problem: it's not actually tortoise's fault: we have line ending style set to native for the xml files. And apparently if you used the cygwin command line client, it used LF, but tortoise used CRLF. So in r9376 we set the eol style for all XML files (and CREDITS) to be LF (while strictly speaking this is only necessary for unicode XML files, I set them for all since it shouldn't matter otherwise, and then we don't have a surprise later if any other file is converted to unicode). Also the SVN-CONFIG file was updated. It might be necessary to remove the track.xml files and re-update to get the proper line ending style (since afaik subversion does only change this on update).

Cheers,
Joerg
hiker
 
Posts: 1435
Joined: 07 Dec 2009, 12:15
Location: Melbourne, Australia

Who is online

Users browsing this forum: Bing [Bot] and 1 guest