denise: Image: Me, facing away from camera, on top of the Castel Sant'Angelo in Rome (Default)
Denise ([staff profile] denise) wrote in [site community profile] dw_dev2010-09-22 05:38 am
Entry tags:

hg update -C tip

So, a while ago, we closed the 'production' branch in Mercurial. Since then, i've been merrily going along with my 'hack, updating my code regularly, yadda, except for some reason I kept having problems applying patches from the review queue...

...many of you can probably figure out where this is going. So, tonight I was having some trouble with S2 changes in dw-nonfree making my update script error out and die, and Afuna and I realized, finally, that it was because I was still set to the 'production' branch in Mercurial. So, if you're like me and keep having problems applying patches, try this:

hg id

If it says 'production', do this:

hg update -C tip


(When I did that, I got "427 files updated, 0 files merged, 28 files removed, 0 files unresolved". Yowch.)
kareila: Taking refuge from falling debris under a computer desk. (computercrash)

[personal profile] kareila 2010-09-22 12:14 pm (UTC)(link)
Eek! Sorry you got bitten by that.
mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)

[staff profile] mark 2010-09-22 05:20 pm (UTC)(link)
The Mercurial branching is kind of problematic. I keep thinking we should move to git and throw things up on github or something which gives nice visual indicators. I suppose launchpad can do similar with hg stuff.
sophie: A cartoon-like representation of a girl standing on a hill, with brown hair, blue eyes, a flowery top, and blue skirt. ☀ (Default)

[personal profile] sophie 2010-09-22 10:46 pm (UTC)(link)
Now, if I was using the latest version of Mercurial on the 'hack box, you probably wouldn't have got bitten by that... I believe the version on the 'hack box doesn't correctly recognised closed branches.

I'm not sure of this, though. And unfortunately, because of the way Ubuntu's packaging system works, to go any higher using the official Ubuntu package I'd need to upgrade the whole system to a later distro - which I should probably do anyway, since Hardy Heron is kind of dated by now - it was released in April 2008.

The issue is that I tend to find that dist-upgrades can cause all sorts of issues if you're not careful, and would probably involve longer-than-usual downtime. (I wouldn't want people to be able to connect to the box while the dist-upgrade was going on, for example, and afterwards you'd need to check configs to make sure everything was still okay, which could be a problem if new configuration options were added.

I keep backups of the essential bits that make the Dreamhack system work (although I don't keep backups of user data), so technically it would be possible to reinstall the whole thing, although I'd need to create all the user accounts again, which would involve running the install script for each user. It only takes 5 minutes, but we currently have 212 Dreamhack users, which would mean it would take about 18 *hours* to do the whole thing. And that doesn't include installing all the base packages needed in Ubuntu, plus it would lose any user data. On the upside, no issues with configuration.

A variant of the above could be if we didn't recreate users, and instead have people reapply. That'd have the effect of also meaning that those who didn't use it wouldn't have their accounts recreated.

(of course, if we did do any of these, I'd make sure to warn everybody via email ahead of time - probably like a month ahead or something.)

[edit: there is a solution to the Mercurial thing which I didn't mention; I could uninstall the official Ubuntu version and compile the latest one directly. That would give us the latest version of Mercurial, but it won't help with the rest of the system being dated.]
Edited 2010-09-22 22:48 (UTC)
dreamatdrew: (Marathon)

[personal profile] dreamatdrew 2010-09-23 03:45 am (UTC)(link)
As far as upgrading the 'hack box, I know 9.04 is a (rather) painless install; it only took me ~3 hrs from nonexistantVM to "Oh, hai, I has a fake DW now". And at least it's more recent?
*contemplates creating DW-Nix* Nah.. bad idea...
murklins: white woman with elephant head (Default)

[personal profile] murklins 2010-09-23 03:52 pm (UTC)(link)
Oh gosh, thanks for this post! I got my dreamhack last year and never touched it once beyond changing the password, but now all of a sudden I log in there every single day and despite all my wiki reading it never occurred to me that I might not be on the default branch. I just did both 'hg update -C default' and 'hg update -C tip' and wow. Wow! That's a scary number of updated files, right?
cesy: "Cesy" - An old-fashioned quill and ink (Default)

[personal profile] cesy 2010-09-24 05:33 pm (UTC)(link)
When I do "hg id" in $LJHOME, I get "abort: There is no Mercurial repository here (.hg not found)". Do I need to be in a different place?
pauamma: Cartooney crab wearing hot pink and acid green facemask holding drink with straw (Default)

[personal profile] pauamma 2010-09-24 06:35 pm (UTC)(link)
You need to be in the repository root ($LJHOME/cvs/dw-free and $LJHOME/cvs/dw-nonfree, normally - run it once in each)