Angband.oook.cz
Angband.oook.cz
AboutDownloadVariantsLadderForumCompetitionSpoilersComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old September 1, 2009, 22:36   #1
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 34
Posts: 1,500
d_m is on a distinguished road
Automatic Mercurial Syncing!

As of today, the Angband Mercurial mirror (http://bitbucket.org/d_m/angband/) should automatically stay in sync with SVN HEAD (with a delay of ~5min). Previously I had been syncing it by hand (once a day or so).

While you can't currently commit to SVN via Mercurial, I still find it useful to create persistent, long-term repositories that store changes , and then export those changes as patches and apply them to SVN.

Happy coding!
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old September 2, 2009, 14:27   #2
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 4,992
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 d_m View Post
As of today, the Angband Mercurial mirror (http://bitbucket.org/d_m/angband/) should automatically stay in sync with SVN HEAD (with a delay of ~5min). Previously I had been syncing it by hand (once a day or so).

While you can't currently commit to SVN via Mercurial, I still find it useful to create persistent, long-term repositories that store changes , and then export those changes as patches and apply them to SVN.

Happy coding!
Bother. I had hoped we could co-ordinate on this. I am about to set up a public git repo (which is kind of a Debian requirement). While there is no real harm in having both git and mercurial repositories in sync with takkaria's svn, it begins to seem unnecessarily complicated. Good to support multiple alternatives though, so I guess that's the bazaar at work.

I guess we just need to encourage anyone checking out anything to let #angand-dev know what they're working on. It would be a great shame if someone put effort into creating a patchset which ultimately couldn't make its way back to svn. (Ok so there aren't enough active developers for this to be a problem yet, but one can hope!)
Magnate is offline   Reply With Quote
Old September 2, 2009, 14:49   #3
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 34
Posts: 1,500
d_m is on a distinguished road
Will your git repo be read/write? Since the Mercurial repo is read-only I don't think it really supplants anything--anyone using it has to make patches that apply against SVN to check anything in, which isn't really different from editing the SVN repo by hand.

Just make sure you publicize the git URL so we can try it out!
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old September 2, 2009, 15:47   #4
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 4,992
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 d_m View Post
Will your git repo be read/write? Since the Mercurial repo is read-only I don't think it really supplants anything--anyone using it has to make patches that apply against SVN to check anything in, which isn't really different from editing the SVN repo by hand.

Just make sure you publicize the git URL so we can try it out!
Will do - though I have rubbish upstream bandwidth (which is partly why I was hoping to join forces!). I hadn't realised your repo was totally read-only, I thought it just wouldn't commit changes back to svn. If I've understood the Debian situation correctly, mine will be writable (I think you'll need an account on alioth.debian.org), and it'll be up to me to manage the upstream transmission (so changes wouldn't automatically go into svn, but whatever takkaria wanted to go in could do so from the git repo without requiring generation of a separate patch).

I'm new to git (and new to alioth.d.o) so it's going to take me a while to get my head around it all. Plus I've just discovered that I'm moving house in 23 days, so I might be offline for a while ...
Magnate is offline   Reply With Quote
Old September 2, 2009, 16:03   #5
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 34
Posts: 1,500
d_m is on a distinguished road
That sounds like a somewhat better deal. It's not that my repo isn't writable in principle, it's just that I'm not totally clear on how to correctly send changes back and I don't want to mess up SVN by accident. When I set it up there wasn't a clear way to get stable, bidirectional SVN<->HG, although apparently there is now [1].

I'm currently using bitbucket.org for hosting--although I do have a server that I can use which has reasonable bandwidth. You could also take a look at github.

Anyway, good luck with moving. If you need any help with setting up git let me know (although I'm no git expert).

[1] http://mercurial.selenic.com/wiki/WorkingWithSubversion
__________________
linux->xterm->screen->pmacs
d_m is offline   Reply With Quote
Old September 2, 2009, 16:21   #6
Magnate
Angband Devteam member
 
Join Date: May 2007
Location: London, UK
Posts: 4,992
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 d_m View Post
I'm currently using bitbucket.org for hosting--although I do have a server that I can use which has reasonable bandwidth. You could also take a look at github.

Anyway, good luck with moving. If you need any help with setting up git let me know (although I'm no git expert).
Thank you. If I play my cards right I hope to end up getting hosted on alioth, but that's a while away. I'll see if anyone complains about the bandwidth once it's up - I'm not expecting a flood of checkouts!

Btw, how come you're here but you're not on IRC? When I'm at work I have the opposite problem - their web filters are quite sophisticated, but they don't seem to know anything about IRC (though MSN is blocked).
Magnate is offline   Reply With Quote
Old September 2, 2009, 17:01   #7
d_m
Angband Devteam member
 
d_m's Avatar
 
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 34
Posts: 1,500
d_m is on a distinguished road
Quote:
Originally Posted by Magnate View Post
Btw, how come you're here but you're not on IRC? When I'm at work I have the opposite problem - their web filters are quite sophisticated, but they don't seem to know anything about IRC (though MSN is blocked).
I had IRSSI running on iceland.freeshell.org, but my screen sessions on that machine periodically crap out so I'm back to using my own server (cage.bearhome.net). Usually I'm on the forum and IRC.

My work is very relaxed--there are no real constraints placed on my access, which is why you'll see the occasional SVN commit during work hours.
__________________
linux->xterm->screen->pmacs
d_m 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
Tracking Angband using Mercurial (DVCS) d_m Vanilla 5 June 18, 2009 22:45
Automatic pricing quirks Pete Mack Vanilla 29 April 16, 2009 21:11
automatic lists+look & colored detection ChodTheWacko Vanilla 5 March 21, 2008 22:15


All times are GMT +1. The time now is 18:56.


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