evolve: revert amend

[Augie Fackler]

On Mon, Aug 11, 2014 at 10:26 AM, Matt Mackall <mpm at selenic.com> wrote:
>> @  changeset:   3173:79c37431f559
>> |  tag:         tip
>> |  parent:      3170:4d0047e4dd50
>> |
>> | x  changeset:   3172:1a7eaca96f66
>> | |  temporary amend commit for 60196217f989
>> | |
>> | x  changeset:   3171:60196217f989
>> |/
>> |
>> o    changeset:   3170:4d0047e4dd50
>> |\   parent:      3169:fcf21e6806af
>
> Always remember, everything in version control is just fancy diff and
> patch:
>
> hg diff --hidden -r 3171:3173 > prematurecommit
> hg diff --hidden -r 3173:3171 > gobackwards
> hg import --no-commit gobackwards
> hg amend
> hg import --no-commit prematurecommit
>
> ..or whatever it is you're trying to do.


I'd spell what he wants as

hg touch --hidden 60196217f989
hg co tip # probably don't need this
hg revert --all -r 79c37431f559
hg prune 79c37431f559

which should effectively undo the bad amend. For paranoia, start from
a clean working copy.