Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old May 14, 2011, 23:22   #11
Tobias
Adept
 
Tobias's Avatar
 
Join Date: Dec 2009
Posts: 172
Tobias is on a distinguished road
Quote:
Originally Posted by takkaria View Post
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?
Tobias is offline   Reply With Quote
Old May 15, 2011, 00:45   #12
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 5,054
Magnate is on a distinguished road
Send a message via MSN to Magnate Send a message via Yahoo to Magnate Send a message via Skype™ to Magnate
Quote:
Originally Posted by Tobias View Post
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.
Magnate is offline   Reply With Quote
Old May 15, 2011, 11:48   #13
Tobias
Adept
 
Tobias's Avatar
 
Join Date: Dec 2009
Posts: 172
Tobias is on a distinguished road
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?

Last edited by Tobias; May 15, 2011 at 12:42.
Tobias is offline   Reply With Quote
Old May 15, 2011, 16:23   #14
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 37
Posts: 1,516
d_m is on a distinguished road
Quote:
Originally Posted by Tobias View Post
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.

Quote:
Originally Posted by Tobias View Post
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.
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old May 15, 2011, 21:28   #15
Tobias
Adept
 
Tobias's Avatar
 
Join Date: Dec 2009
Posts: 172
Tobias is on a distinguished road
Quote:
Originally Posted by d_m View Post
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.
Tobias is offline   Reply With Quote
Old May 15, 2011, 21:30   #16
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 37
Posts: 1,516
d_m is on a distinguished road
Quote:
Originally Posted by Tobias View Post
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.
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old May 15, 2011, 22:02   #17
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 5,054
Magnate is on a distinguished road
Send a message via MSN to Magnate Send a message via Yahoo to Magnate Send a message via Skype™ to Magnate
Quote:
Originally Posted by Tobias View Post
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.
Magnate is offline   Reply With Quote
Old May 15, 2011, 22:30   #18
Tobias
Adept
 
Tobias's Avatar
 
Join Date: Dec 2009
Posts: 172
Tobias is on a distinguished road
Quote:
Originally Posted by d_m View Post
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.
Tobias is offline   Reply With Quote
Old May 16, 2011, 00:54   #19
Max Stats
Swordsman
 
Join Date: Jun 2010
Posts: 324
Max Stats is on a distinguished road
Quote:
Originally Posted by Tobias View Post
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?
Max Stats is offline   Reply With Quote
Old May 26, 2011, 22:28   #20
konijn_
Hellband maintainer
 
konijn_'s Avatar
 
Join Date: Jul 2007
Location: New York, the Big Apple
Age: 40
Posts: 351
Donated: $120
konijn_ is on a distinguished road
Angry

Quote:
Originally Posted by Magnate View Post
(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.
__________________
* Are you ready for something else ? Hellband 0.8.7 is out! *
konijn_ is offline   Reply With Quote
Reply


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
Compiling Angband on MS-DOS Zababa Development 8 May 27, 2011 18:36
Compiling Angband 3.0.9 w/ xcode on OSX Iemortal Vanilla 8 April 16, 2011 17:41
Compiling Z+Angband under Windows Altefcat Variants 8 December 11, 2008 10:44
compiling vanilla angband on msvc++ 9 express hugh Vanilla 6 March 17, 2008 16:49
Trouble compiling angband 3.0.9 on linux RastaRuedi Vanilla 2 August 1, 2007 18:28


All times are GMT +1. The time now is 02:46.


Powered by vBulletin® Version 3.8.7
Copyright ©2000 - 2017, vBulletin Solutions, Inc.