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

[vlion]

Well, branching is used to keep one's commits off the mainline, which is sometimes what mq is used for - so if branches are not used, then mq must be?

[afuna]

Oh! Well since we need to get things reviewed before commit, usually changes end up being split off into a patch and uploaded to zilla, instead of having patches committed directly, and pushed to the central repository.

[vlion]

*durpy stare*

Ooooh. Interesting.....

huh.

Okay.

[kareila]

Yes, what she said.

Also, the real alternative to named branches in Mercurial is cloning multiple copies of a repository, and pushing and pulling changes between them.

[kareila]

Whoops, my network connection burped. Sorry for the doubled comment!