Mercurial: closing named branches

[kareila]

I will shortly be pushing changesets that close the staging and production branches in the dw-free repository. The branch system hasn't been used effectively and causes problems whenever cloning a new copy of the repository, so I'm reverting to using the default branch for all development.

There shouldn't be any user facing changes from this, except for one change to bootstrap.pl. However, if you run into any difficulties please let me know immediately. Thanks!

ETA: my testing shows that you may have to manually do hg update -C tip after pulling in the dw-free changes, since the active branch has been switched. After that everything should work normally, although the branches will not appear to be closed until you update Mercurial to a version that supports branch closings.

Comments

[sophie]

Actually, I meant that existing repos are fine too - just update and there's no problem:

dh-testuser@hack:~/dw/cvs/dw-free$ hg heads
changeset:   2582:3d6b9b44d272
branch:      production
tag:         tip
user:        fu
date:        Tue Jul 06 02:34:20 2010 +0800
summary:     http://bugs.dwscoalition.org/show_bug.cgi?id=2289

dh-testuser@hack:~/dw/cvs/dw-free$ ~/dw/bin/cvsreport.pl -u
Updating CVS dir 'dw-free' ...
pulling from http://hg.dwscoalition.org/dw-free
searching for changes
adding changesets
adding manifests
adding file changes
added 62 changesets with 273 changes to 209 files (+2 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
86 files updated, 0 files merged, 0 files removed, 0 files unresolved

[... snip rest of update ...]

dh-testuser@hack:~/dw/cvs/dw-free$ hg heads
changeset:   2644:9786201db0cb
tag:         tip
user:        kareila
date:        Fri Jul 23 09:35:07 2010 -0500
summary:     http://bugs.dwscoalition.org/show_bug.cgi?id=2837

changeset:   2620:2fa8c5fd7953
branch:      production
parent:      2617:9f696cf19910
user:        kareila
date:        Mon Jul 19 12:13:29 2010 -0500
summary:     closing production branch

changeset:   2618:80bf5c8a0bfc
branch:      staging
parent:      85:74330150fd51
user:        kareila
date:        Mon Jul 19 12:10:55 2010 -0500
summary:     closing staging branch

And indeed, that's the latest change right now. I don't think there are any problems associated with having 3 heads, so nobody actually needs to force an update.

As for upgrading Mercurial, I could compile from source; that should work. But then the Dreamhack box wouldn't be the ideal 'supported installation', I suspect.

[sophie]

I do believe I confused the hg heads and hg parents commands. I apologise, and humbly eat my words.

(for those who aren't aware; hg heads shows the latest revisions for each open branch in the repository, while hg parents shows the revision that the working copy is based on. I thought that the former did what the latter does. Ooooops.)

Sorry 'bout that!