By: jespern

jespern — Fri, 10 Apr 2009 14:36:37 +0000

Steve,

You’re right, TIMTOWTDI. Since this is something that can be done without the use of MQ, I figured it’d also serve as a gentle introduction to MQ :-)

Thanks for adding the instructions on how to do this with normal Hg and rebase (I haven’t used it much), I for one found it very informative, and I’m sure other people will too.

By: Steve Losh

Steve Losh — Fri, 10 Apr 2009 14:24:54 +0000

While this definitely works, why use MQ for it? You could just use branching and merging to avoid destroying history while getting the same effects, or use rebasing to edit the history with less commands to remember.

For example (I hope Markdown works in the comments…):

$ hg glog
@ changeset: 2:45ef854eb6aa tip
| summary: add B
|
o changeset: 1:7bcb1d228f55
| summary: add C
|
o changeset: 0:491e35bba6dd
summary: add A

$ hg update -C 0

$ touch D

$ hg commit -Am ‘add D’

$ hg update -C 2
2 files updated, 0 files merged, 1 files removed, 0 files unresolved

$ hg merge tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don’t forget to commit)

$ hg commit -m ‘Pull the bugfix into the experimental branch.’

$ hg rebase –source 3 –dest 2
saving bundle to …path here…
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rebase completed

MQ is extremely powerful and great for stuff like folding together or rearranging commits, but it’s a pretty complex tool to use if all you want to do is move a changeset temporarily.

Comments on: Mercurial powertip: Move changesets out of the way momentarily

By: jespern

By: Steve Losh