Uncommitted changes and merge

[Gregory Collins]

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.

In my opinion MQ needs to have some smarts re: which changeset your
patch is based upon; qpop / update / qpush should recognize that a
merge should be performed.

Gregory Collins <greg at maptuit.com>