The International Simutrans Forum

Simutrans Extended => Simutrans-Extended development => Topic started by: wernieman on November 08, 2010, 09:47:27 AM

Title: Simutrans-EXP and GIT
Post by: wernieman on November 08, 2010, 09:47:27 AM
Hey,

I try GIT, put I get some Problems ...
(It is a Linux-Machine, and for the nightlys, I must use Command-Line-Tools)

When I "clone" the git, get I the actually sources?
git clone http://github.com/jamespetts/simutrans-experimental.git

I can compile the source-code, I get with the git command line Tool, but I don´t know, if it is the newest source code.

Can somebody help?

Greeting,
Werner

(With SVN from simutrans-standard I don´t have the Problem ;o) )
Title: Re: Simutrans-EXP and GIT
Post by: inkelyad on November 08, 2010, 10:43:04 AM
You know, Github have (http://help.github.com/) very good help.

After 'git clone' you will get not just source. You will get full copy of repository.
Current development branch is not 'master' now, it is '9.x'. So
do 'git checkout 9.x'

If you don't do you own development, then do 'git fetch;git merge origin/9.x' to keep code up-to date.
If you do develop, then read Pro Git Book (http://progit.org/book/). It will be faster then use forum.
Title: Re: Simutrans-EXP and GIT
Post by: jamespetts on November 08, 2010, 11:37:55 PM
Unless you want to change branches manually frequently, I recommend setting it to pull from "-devel" for nightly builds. It's not currently as up to date as 9.x, but it will be quite easy for me to merge in from 9.x so that -devel no worse than 9.x: let me know if you'd like me to do this.
Title: Re: Simutrans-EXP and GIT
Post by: wernieman on November 09, 2010, 08:55:48 AM
yes ... but how I use it .....
Title: Re: Simutrans-EXP and GIT
Post by: jamespetts on November 10, 2010, 04:04:33 PM
I don't know the command line interface, as I use the Windows GUI for GIT. Ansgar knows how to use the command line interface, I think, or, as inkelyad suggested, there are tutorials online.
Title: Re: Simutrans-EXP and GIT
Post by: wernieman on November 10, 2010, 04:06:26 PM
But for this .. I don´t understand the online tutorials .....
Title: Re: Simutrans-EXP and GIT
Post by: jamespetts on November 10, 2010, 04:13:19 PM
Have you tried asking Ansgar? It was he who introduced me to Git in the first place.