[PATCH 3 of 6] amend: fix unlocking order - first lock then wlock

[Augie Fackler]

queued the first three of this series, 4 needs a resend (momentarily), don't feel qualified to review 5.

On Apr 16, 2013, at 10:11 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1366162868 -7200
> # Node ID 50b42260018a4739637cde911f42c04ecd402c88
> # Parent  815cbc05cd06440e71448fd43d20142d2fc1db91
> amend: fix unlocking order - first lock then wlock
> 
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -1790,7 +1790,7 @@ def amend(ui, repo, commitfunc, old, ext
>     finally:
>         if newid is None:
>             repo.dirstate.invalidate()
> -        lockmod.release(wlock, lock)
> +        lockmod.release(lock, wlock)
>     return newid
> 
> def commiteditor(repo, ctx, subs):
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel