[issue1355] merge with mq patches should abort

[Thomas Arendsen Hein]

New submission from Thomas Arendsen Hein <thomas at intevation.de>:

'hg merge' should abort when one of the changesets which should be merged are
handled by mq.
reposetup.mqrepo.abort_if_wdir_patched only checks the working dir parents, so
we need an additional check for the to-be-merged-with changeset.

If monkey patching hg.merge() we have to make sure that the call to this
function in queue.mergeone() will go to the unmodified original.

If using the uisetup way like currently done for hg import, we have to make sure
that we do not only catch 'hg merge', but other things that do merging, too,
e.g. fetch and imerge extensions.

I'd prefer patching hg.merge(), what do others think?

----------
assignedto: ThomasAH
messages: 7624
nosy: ThomasAH, wilde
priority: bug
status: unread
title: merge with mq patches should abort
topic: mq

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1355>
____________________________________________________