[PATCH STABLE] amend: invalidate dirstate in case of failure (issue3670)

[Idan Kamara]

On Sat, Dec 29, 2012 at 7:10 PM, Pierre-Yves David <
pierre-yves.david at ens-lyon.org> wrote:
>
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1356800418 -3600
> # Branch stable
> # Node ID a51a5199a672e378924066cd5103afef8de26fb8
> # Parent  52581d2b98ac5355c3b2ea304595f8cfee4cce59
> amend: invalidate dirstate in case of failure (issue3670)
>
> The temporary commit created by amend update the dirstate. If the final
> commit
> fails, we need to invalidate the change made to the dirstate, otherwise
> the
> release of the wlock will write the dirstate created after the rollbacked
> temporary commit.

It also moves the active bookmark, which causes it to vanish
to thin air if the transaction is aborted (since it points to a
non existing node).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121229/f0595771/attachment.html>