blog/2014/new-mercurial-workflow/

[ahal]

https://ahal.ca/blog/2014/new-mercurial-workflow/

[ahal]

Gregory Szorc wrote on 2014-11-08 17:52:57

Excellent post!

I guess you didn't know that firefoxtree automatically creates aliases for the Firefox repositories. i.e. `hg pull central` just works with no hgrc hacking needed.

This blog post inspired me to write up some Sphinx docs for firefoxtree tree so its awesomeness is fully realized. Stay tuned...

[ahal]

ahal wrote on 2014-11-08 20:12:54

I didn't. I actually had a 'central = ... ' alias already, so I didn't notice. In the post I changed it to 'm-c' to differentiate it from the local tag, but I guess there's no need for that. Thanks for pointing it out though, I'll update the post.

[ahal]

Gregory Szorc wrote on 2014-11-08 21:08:39

And https://mozilla-version-con... is live.

[ahal]

Chris wrote on 2014-11-10 04:26:57

Thanks for sharing, Andrew. This was a great introduction to bookmarks and reviewboard. I'm going to throw out my old hg and mq shortcuts and try to stick with this new workflow. :)

[ahal]

Mathiasdm wrote on 2014-11-10 06:29:47

"This is enough of a pain that I'd recommend avoiding user repositories for this purpose unless you
can figure out how to make them non-publishing."

I would propose you mention how to make them non-publishing, it only requires:

[phases]
publish = False

Nice post, by the way!

[ahal]

ahal wrote on 2014-11-10 14:45:04

Good point. In the case of user repos, I don't think most people have
permission to ssh in and make this change (someone correct me if I'm wrong). But it's a necessary step no
matter where it lives. Updated!

[ahal]

J. Ryan Stinnett wrote on 2014-11-11 05:34:52

What do the steps to rebase a long-lived feature branch look like with this workflow?

[ahal]

ahal wrote on 2014-11-11 14:03:28

You mean a twig like alder or birch? As long as it's a repo firefoxtree knows about (https://hg.mozilla.org/hgcu... then it shouldn't be any different from rebasing on top of central.

hg rebase works similarly to git rebase. If there's a conflict it will suspend, you have to fix the conflict manually and then run `hg rebase --continue`.

[ahal]

nthomas wrote on 2014-11-12 08:58:54

gps is already on this case, see https://bugzilla.mozilla.or...