diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -1162,19 +1162,17 @@ # plain versions for i18n tool to detect them _("local changes found, qrefresh first") _("local changed subrepos found, qrefresh first") - - statemod.checkunfinished(repo) s = repo.status() if not force: - if len(repo[None].parents()) > 1: - _("outstanding uncommitted merge") #i18 tool detection - raise error.Abort(_("outstanding uncommitted merge"+ excsuffix)) + statemod.checkunfinished(repo) if s.modified or s.added or s.removed or s.deleted: _("local changes found") # i18n tool detection raise error.Abort(_("local changes found" + excsuffix)) if checksubstate(repo): _("local changed subrepos found") # i18n tool detection raise error.Abort(_("local changed subrepos found" + excsuffix)) + else: + statemod.checkunfinished(repo, skipmerge=True) return s _reserved = ('series', 'status', 'guards', '.', '..') diff --git a/tests/test-mq-qnew.t b/tests/test-mq-qnew.t --- a/tests/test-mq-qnew.t +++ b/tests/test-mq-qnew.t @@ -164,8 +164,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon (no more unresolved files) - abort: outstanding uncommitted merge - (use 'hg commit' or 'hg merge --abort') + abort: cannot manage merge changesets $ rm -r sandbox hg headers @@ -244,8 +243,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon (no more unresolved files) - abort: outstanding uncommitted merge - (use 'hg commit' or 'hg merge --abort') + abort: cannot manage merge changesets $ rm -r sandbox Test saving last-message.txt