Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old February 6, 2011, 08:42   #11
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,418
Donated: $40
Pete Mack is on a distinguished road
@Nick --
That's crazy. I just want to keep a local copy up to date.
What I am really looking for is the functionality to update the local copy, and overwrite any conflicting local changes.
Code:
svn update
svn revert <things that update complains about>
svn update
Pete Mack is offline   Reply With Quote
Old February 6, 2011, 11:46   #12
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 5,057
Magnate is on a distinguished road
Send a message via MSN to Magnate Send a message via Yahoo to Magnate
Quote:
Originally Posted by Pete Mack View Post
@Nick --
That's crazy. I just want to keep a local copy up to date.
What I am really looking for is the functionality to update the local copy, and overwrite any conflicting local changes.
If you aren't going to maintain your own repo as Nick suggests, you can just "git clone git://github.com/angband/angband.git" to create a new local copy of the official upstream repo. Your "master" branch will automatically track origin/master.

To keep up to date, the commands are:

1. Git fetch origin

2. Git checkout master (if you're not there already)

3. Git merge origin/master

You shouldn't have to worry about overwriting conflicts, because you shouldn't be doing local changes in your master branch anyway. Just create a new branch for local changes and use merge or rebase to update it.

Similarly, you can create a staging branch to track the upstream staging branch if you want to help test that.

See also http://trac.rephial.org/wiki/GitUsage.
Magnate 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
Moving to Git takkaria Development 57 December 4, 2010 10:22
Vanilla, Trac, Git, etc. takkaria Development 2 November 2, 2010 14:52
Bug in current vanilla, Git? Trac? Timo Pietilš Development 4 October 10, 2010 22:12
Sangband SVN/Git/? camlost Development 7 September 9, 2010 19:31
Threaded view misery Magnate Oook! 3 November 29, 2009 17:36


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


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2019, vBulletin Solutions Inc.