Uncommitted changes and merge

[Giorgos Keramidas]

On 2007-09-06 10:20, Gregory Collins <greg at maptuit.com> wrote:
>Giorgos Keramidas <keramida at ceid.upatras.gr> writes:
>> With the MQ extension you can push several local changes on top of
>> the 'ready' code, test them, pop them out again, refine them,
>> 'rebase' them on top of a newly pulled set of changesets, and so on.
>
> The three-way merge procedure for rebasing patches (the
> "qsave/pull/update/qpush -m/qpop -a/qpop -a -n patches.1" cycle) is
> hellish at best. Please let me know (and update the MqMerge page on
> the wiki) if there is a simpler procedure.

Agreed.  I would definitely love a single-command interface to all this,
i.e. something resembling:

	hg qpush -a
	hg pull
	hg qrebase --rev tip

I don't know how feasible or easy that would be though.