The International Simutrans Forum

 

Author Topic: Big "fix it" patch for simutranslator, and please stop making DOS line endings..  (Read 13016 times)

0 Members and 1 Guest are viewing this topic.

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
OK I've changed this. Can I just confirm this should now mean all future commits are in the right format, i.e. no DOS line-endings?

Sadly, no.  New files will probably have DOS line endings.  You need to do the following.

First, find the configuration settings in TortoiseSVN, using these instructions:
http://www.mediawiki.org/wiki/Subversion/auto-props

Then, In [miscellany] uncomment/add this line:

Code: [Select]
enable-auto-props = yes
In the [auto-props] section, uncomment the default bits and also add:
Code: [Select]
*.dat = svn:eol-style=native
That should guarantee that newly added .dat files have standard line endings.

I just corrected everything currently in the pak128.Britain repository using a script, so existing files should be good as of now.

Milko: if you're using Windows, you need to make sure that you have the "core.autocrlf" set to "true" in your git settings. (See https://help.github.com/articles/dealing-with-line-endings#platform-windows ).

(edited to fix significant typo)
EDIT 2:
I'm going to wait a little bit after fixing the line endings before applying my patches, to let the fix propagate to git and to make sure no trouble got introduced.

Offline The Hood

  • Moderator
  • *
  • Posts: 2889
  • pak128.Britain developer
OK I think I made some of those changes but not all. Will check when I get chance. Thanks for sorting it all out!

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
I'm having an odd problem.  The changes committed to SVN aren't propagating to the git mirror.  Aburch, are you anywhere?

Edit: is Aburch on github the same person as "ansgar" here?
Edit 2: oooh-kay, this is a much worse problem than I thought.  The Git mirror is working fine.  My commit has failed to register at Sourceforge.  Even though my local copy SAYS that it's committed.

I've never had this sort of problem with SVN before; are you using some sort of weird configuration?  Can you just switch to git already?

Edit 3: OK, it's shown up on Sourceforge.  Now I just have to figure out when it's going to show up in the git mirror and then I can recheck my patches....

Edit 4: Looks like I may have committed just after the daily update, so I may have to wait six more hours.
« Last Edit: June 13, 2012, 09:12:57 PM by neroden »

Offline prissi

  • Developer
  • Administrator
  • *
  • Posts: 9460
  • Languages: De,EN,JP
As far as I know, the paksets are not transferred to github.

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
pak128.britain has a mirror.

EDIT:
https://github.com/aburch/simutrans-pak128.britain

It doesn't seem to have updated, and it's been 24 hours.  I guess I need to ask Ansgar how often it updates.
« Last Edit: June 14, 2012, 03:57:08 AM by neroden »

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
OK, so how do I contact Ansgar -- is 'aburch' on github the same as ansgar here?

I wait impatiently for a reply.

Please pay attention to how much of my simutrans time has been wasted in trying to get other people to authorize things (close to a year to get a simutranslator account) or even to get them to check that their scripts are working (the git mirror of pak128.britain was working six days ago, why did it break?)

Offline VS

  • Senior Plumber (Devotee)
  • Devotee
  • *
  • Posts: 4855
  • Vladimír Slávik
    • VS's Simutrans site
  • Languages: CS,EN
Yes for the first question. His full name is Ansgar Burchardt and he is all over the internets.

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
Yes for the first question. His full name is Ansgar Burchardt and he is all over the internets.

Thank you.  I didn't know how many people there were named Ansgar Burchardt -- for all I know it's like John Smith. :-)

Anyway, I sent him a private forum message, we'll see if he can kick the mirror into working perhaps.  Sigh.

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
...and we're good (thanks, Ansgar).  But now I have to run off.  I'll try to get the patches re-verified and in today or tomorrow.

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
OK, they're in.  :whew:

Offline The Hood

  • Moderator
  • *
  • Posts: 2889
  • pak128.Britain developer
Thanks. Can you keep an eye on this after my next few commits to see how we are doing?

Offline neroden

  • Devotees (Inactive)
  • *
  • Posts: 831
  • Nathanael Nerode
Thanks. Can you keep an eye on this after my next few commits to see how we are doing?

I will do my best.  Please remember to add the terminating line of dashes, by the way; I just fixed two more of these in the air directory.

Edit: and another in bus/parcel-coach.dat.

I think the reason simutranslator cares is due to its processing method.