[PATCH 7 of 7 V2 stable] resolve: use "other" changeset from merge state (issue4163)

[Matt Mackall]

On Thu, 2014-02-27 at 15:25 -0800, pierre-yves.david at ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1393382701 28800
> #      Tue Feb 25 18:45:01 2014 -0800
> # Branch stable
> # Node ID e9c7a904463947c37c21a8d195b535f667b35f19
> # Parent  219c3064c7763c1adb56e82a946fd9ab776a8a1d
> resolve: use "other" changeset from merge state (issue4163)
> 
> We can use the "other" data from the recorded merge state instead of inferring
> what the other could be from working copy parent. This will allow resolve to
> fulfil its duty even when the second parent have been dropped.
> 
> Most direct benefit is fixing a regression in backout.

These are queued for stable, thanks.

This would normally be a bit too invasive for stable, but it's killing
off a large class of bugs, so it's probably worth it. Crossing fingers.

-- 
Mathematics is the supreme nostalgia of our time.