Mercurial / hg - abort: outstanding uncommitted merges

Solution 1:

hg update --clean -r tip resolved the problem...

[mpenning@host1 login]$ hg update --clean -r tip
resolving manifests
getting Protocol.py
getting Session.py
getting mp_getconf.py
getting mp_runcmd.py
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
[mpenning@host1 login]$ hg up
resolving manifests
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
[mpenning@host1 login]$

Solution 2:

At some point you did:

$ hg pull (or maybe someone pushed to you)
$ hg merge

...and then carried on. This left the merge uncommitted. That's what 'abort: outstanding uncommitted merges' means. You can't do 'x' because there's you haven't finished working on the merge you started.

What you should have done is:

$ hg pull
$ hg merge
  <Sorted out any issues>
$ hg commit -m 'Merged the blah with wibble-wah'

...and then carried on.

hg status and hg summary would have shown there were outstanding changes.