Question

We have two named branches in Mercurial:

• “default” – a “bugfixing” branch where we fix bugs
• “redesign” named branch where we do a whole new UI-design for the app

Now, I’d like to merge my “bugfixing” branch into the “redesign” branch. But keeping the “bugfixing” branch untouched.

In other words, I want to update my named branch from default, but without actually merging the branches. Can’t figure a way to that…

Should I just do

hg merge default

while in my named branch? But will this keep the two branches?

PS. I’m quite new to hg, sorry if this is a stupid question…

Answer 1

I want to update my named branch from default, but without actually merging the branches

I.e you want merge branches in terms of Mercurial – merge default to redesign. In Mercurial branch-merge does not mean “You can’t use merged branch anymore” – you can, just update to branch head, edit and commit