Moving Changes to Feature Branches After-the-Fact in Mercurial

At my workplace we use Mercurial. We don’t usually work in feature-branches, but in the default branch instead. This is usually not problematic, but I keep running into the following situation: I started working on feature A (on the default branch), when suddenly I am forced to work on (and ship) feature B instead, for whatever reason. When that happens, I usually say to myself “God damn it! I wish I worked on A in a branch to begin with!”.

Enter hg rebase. Here’s what you do.

Read More

Learning to Use Mercurial

This post is going to be brief. I’ve been reading about Mercurial, since we are soon going to use it at my workplace. I just popped here to recommend Joel Spolsky’s great Mercurial tutorial. It’s written really well, in par with Joel’s usual stuff, very funny and educational.

See that? She’s still working with Tortilla chips. Tortilla chips!