So I had a workspace I needed to get integrated back to the ON gate. I last worked on it about Feb 14th and I couldn't remember which machine, let alone which workspace it was located in. I found one that looked right and started the merge off:

[th199096@aus-build-x86 smurf]> hg pull -u
pulling from ssh://onnv.eng//export/onnv-clone
searching for changes
adding changesets
adding manifests
adding file changes
added 646 changesets with 5986 changes to 4868 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
[th199096@aus-build-x86 smurf]> hg merge
abort: outstanding uncommitted changes

I've seen this before, it normally means my workspace has been corrupted. I can at least recover to get the original version of the changes:

[th199096@aus-build-x86 smurf]> hg rollback
rolling back last transaction
[th199096@aus-build-x86 smurf]> hg commit
nothing changed
[th199096@aus-build-x86 smurf]> hg status
! usr/src/pkgdefs/SUNWmptsas/copyright
! usr/src/pkgdefs/SUNWmptsas/depend

But I don't see what I never committed! Try again:

[th199096@aus-build-x86 smurf]> hg merge
abort: there is nothing to merge
[th199096@aus-build-x86 smurf]> hg pull -u
pulling from ssh://onnv.eng//export/onnv-clone
searching for changes
adding changesets
adding manifests
adding file changes
added 646 changesets with 5986 changes to 4868 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
[th199096@aus-build-x86 smurf]> hg merge
abort: outstanding uncommitted changes
[th199096@aus-build-x86 smurf]> hg rollback
rolling back last transaction
[th199096@aus-build-x86 smurf]> hg list
modified:
        usr/src/uts/common/fs/nfs/nfs_server.c

Okay, that looks right for what I need to modify. I then proceeded to create a new workspace into which I was going to copy over the file. Once I did that, I did a diff and realized that the reason I was getting an error was that this set of changes had already been integrated into the ON gate!