Bas Schouten - Latest Comments on MQ to Changeset Evolution: A Dummy Guide

Florian Quèze [Visitor] in response to: MQ to Changeset Evolution: A Dummy Guide

Mon, 11 Feb 2019 11:28:25 +0000

If hg qref is in your muscle memory, you can just use hg ref instead, as “hg refresh” is conveniently an alias of hg amend.

Steve Fink [Visitor] in response to: MQ to Changeset Evolution: A Dummy Guide

Mon, 04 Feb 2019 22:36:52 +0000

`hg evolve` handles a bunch of different things, and doesn’t advance you to the next patch. `hg evolve; hg next` is probably about the same as `hg next –evolve`. Personally, I have

[defaults]
next = –evolve

in my ~/.hgrc so I can just say `hg next`. I never wouldn’t want the –evolve; it won’t do anything if it doesn’t need to.

The biggest advantage of this workflow over mq is that merges work properly, so you get far fewer conflicts. `hg rebase -d inbound` is more likely to work than `hg pull –rebase` with mq, and vastly more likely to work than `hg qpop -a; hg pull -u; hg qpush -a`.

Jan [Visitor] in response to: MQ to Changeset Evolution: A Dummy Guide

Sun, 03 Feb 2019 09:52:17 +0000

Some additions:

* hg amend is a bit shorter than hg commit –amend and it doesn’t ask you to update the commit message.

* hg evolve is similar to hg next –evolve maybe?

* hg pick is great for pushing a random commit on top of whatever is current tip. Like qpush.

* hg pdiff is like MQ’s hg qdiff

* hg split/fold are nice. fold is a bit like MQ’s qfold.

* I actually rarely use bookmarks and prefer |hg wip| as configured by ./mach bootstrap.