Evolve: amend in histedit falls out of histedit?

[Malcolm Matalka]

I was mangling commits in a repo and did the following:

hg histedit
edit a commit
hg amend -i some/file

Then I realized that I didn't want to do that amend.  So I did hg
histedit --abort, which "succeeded" in that I came out of the histedit,
but I stayed in the repo state I had before the abort, that is my commit
was modified and I had uncommitted content left and the commit I was
editing wasn't updated and my bookmark moved.  You can see in the hg log
-G that everything has been orphaned correctly but I'm still not in the
"right" place.


@  changeset:   6405:1e263f00c094
|  tag:         tip
|  parent:      6391:01bf3c043c8b
|  user:        Malcolm <malcolm at terrateam.io>
|  date:        Mon Jul 04 08:55:37 2022 -0400
|  summary:     REFACTOR Terrat Make errors a list of lines
|
| *  changeset:   6404:81d3a86d7187
| |  bookmark:    terrateam-add-infracost-integration
| |  parent:      6402:44d5d6cdc092
| |  user:        Malcolm <malcolm at terrateam.io>
| |  date:        Fri Jul 01 21:44:11 2022 -0400
| |  instability: orphan
| |  summary:     ADD Terrat Cost estimation integration
| |
| x  changeset:   6402:44d5d6cdc092
|/   parent:      6391:01bf3c043c8b
|    user:        Malcolm <malcolm at terrateam.io>
|    date:        Mon Jul 04 08:55:37 2022 -0400
|    obsolete:    amended using amend as 6405:1e263f00c094
|    summary:     REFACTOR Terrat Make errors a list of lines