Getting Angband from Github and compiling it

[Tobias]

Originally Posted by takkaria

If you branched from the official github repository, then 'git pull' should automatically merge them in for you.

I meant, the online fork on github. How do I rebase this to a newer main version?

[Magnate]

Originally Posted by Tobias

I meant, the online fork on github. How do I rebase this to a newer main version?

1. Clone your fork locally using "git clone http://github.com/yourID/angband". You now have a local repo which tracks your fork as a remote called "origin".

2. Add the official repo as a remote with "git remote add official http://github.com/angband/angband".

3. Update your local tracking of the official repo with "git fetch official".

4. Merge the latest official changes into your local repo with "git merge official/master".

5. Push those changes up to your github repo with "git push origin master".

This assumes you have not strayed from your master branch in your local repo during this whole exercise.

[Tobias]

Thanks Magnate, I will try this sometime.

Also, how can you search the online tree, or the commit log, like you could on the old system?

And what is the easiest way to restore a single file to the official state?

[d_m]

Originally Posted by Tobias

Also, how can you search the online tree, or the commit log, like you could on the old system?

Depends on what you mean. You can do things like "git log" and just scroll around to read it, or you can do "git log | grep 'hello world'" to search for 'hello world'. You can also do "git grep" if you want to find a particular piece of sourcecode (or something) that is no longer there.

Originally Posted by Tobias

And what is the easiest way to restore a single file to the official state?

git checkout FILE will revert FILE to its current state in HEAD. This will be the same as the official state as long as you aren't committing to the repo yourself.

[Tobias]

Originally Posted by d_m

Depends on what you mean. You can do things like "git log" and just scroll around to read it, or you can do "git log | grep 'hello world'" to search for 'hello world'. You can also do "git grep" if you want to find a particular piece of sourcecode (or something) that is no longer there.

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

[d_m]

Originally Posted by Tobias

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

In that case you should check out: https://github.com/angband/angband.

[Magnate]

Originally Posted by Tobias

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

Your memory is correct - trac integrates very well with svn, and the browsing was cool. We *could* set up trac to browse the git repo online, but it's crushingly slow - trac and git do not like each other much. So as d_m says, you're better off browsing the commits at github itself. Just go to the official repo (link in d_m's reply) and click the Commits button.

[Tobias]

Originally Posted by d_m

In that case you should check out: https://github.com/angband/angband.

I had seen it but I can't find the search function no matter how much I look.

[Max Stats]

Originally Posted by Tobias

No I meant on the website. In the old days the you could search the commit log from the trac.rephial.org site. Or maybe I am remembering wrong.

If you click "Commits" in the bar at the top of the screen, it will show you a list of commits grouped by date, starting with the most recent. Is that it?

[konijn_]

Originally Posted by Magnate

(Pav - I thought I'd offer this because the stickied SVN thread is now out-of-date for V - feel free to nuke it if it's not helpful enough. Maybe it's obsolete now we have nightlies?)

This tutorial assumes that you are using git at a command line. If you are using git via a GUI or IDE, you probably know all this already. Besides, there are too many possible GUIs to cover them all.

First off, awesome !! Github is what I've been ranting about without being able to put a name or technology on it.

Second off, I forked Angband and it wont compile for Cygwin with .win ( which wants me to use Ming ?? ) , the .std compiles till it hits wiz-stats.c and then dies on this :

wiz-stats.c:1107: error: `for' loop initial declaration used outside C99 mode
wiz-stats.c:1115: error: `for' loop initial declaration used outside C99 mode

And the crapton of warnings... makes my eyes bleed and sigh deeply. Are these warnings only visible in cygwin or do we no longer care about clean compiles ?

T.