Comments on: Three simple Mercurial rules

By: G. Richard Bellamy

G. Richard Bellamy — Fri, 30 Sep 2011 13:14:00 +0000

This is intriguing. Maybe show a screenshot of the DAG using this workflow, for comparison?

By: Robin Clowers

Robin Clowers — Tue, 01 Feb 2011 17:45:30 +0000

Do you ever run into problems with rebase? I have been using a rebase workflow for some time now, but every now and then I have strange problems. Just the other day a rebase failed with an error about not being able to access a file, and let my repo with several commits duplicated.

By: bogardj

bogardj — Tue, 01 Feb 2011 17:21:59 +0000

@Brian

For project work, I’ve stopped using bookmarks. Instead, just named branches. This is because most of the time I want to push what I have to the central repo, and bookmarks just aren’t as well integrated with 3rd party tools.

For OSS stuff, I do find that bookmarks work better, since I’m doing a lot more experimenting and whatnot.

The thing is, you can always move commits on an anonymous branch/bookmark to a named branch to “graduate” them, if you use the transplant extensions.

By: David Mohundro

David Mohundro — Tue, 01 Feb 2011 16:08:26 +0000

That’s pretty close to the workflow that has worked for us – one of my coworkers blogged about it at http://rndnext.blogspot.com/2011/01/mercurial-named-branch-workflow.html.

Win because it works with TeamCity and it’s also been relatively easy for us to integrate in with our bug tracking software as well.

By: Brian Sullivan

Brian Sullivan — Tue, 01 Feb 2011 15:28:58 +0000

So have you stopped using bookmarks, or are you still using them for local topic branches that never end up getting pushed?

I’ve found that bookmarks are nice because they’re lightweight, but I run into trouble when something I thought was going to be a short-lived topic “branch” ends up needing to be pushed and maintained as a slightly longer-lived separate line of development.

TeamCity in particular makes me consider using branches more often, since I can’t create a new build based on a bookmark, but I can with a branch.