problem with hg histedit (evolved enabled)

[Uwe Brauer]

Hi

I had 2 commits which I wanted to push, before I realised I need to
modify the last commit message.

 I run hg histedit

Emacs popped up, I chose message for the latest commit and pick for
penultimate commit saved and then nothing happened, however the
penultimate commit was marked as obsolete, the commit message did not
change.

I run hg histedit --continue

Basically with the same result.

So after 2 iterations, I disabled evolve and repeated the process.

Now the repository is in a strange state 

I run hg up tip and I obtain 

warning: ignoring unknown working parent 922dc685b7e9!
Rome-Notes/main.out: untracked file differs
Rome-Notes/main.synctex.gz: untracked file differs
Rome-Notes/main.toc: untracked file differs
abort: untracked files in working directory differ from files in requested revision


The last two commits are not displayed and I am stuck.

Any help is appreciated.

Regards

Uwe Brauer