[PATCH STABLE] rebase: ignore negative state when updating back to original wc parent

[Matt Mackall]

On Tue, 2014-12-02 at 12:21 -0800, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at fb.com>
> # Date 1417547198 28800
> #      Tue Dec 02 11:06:38 2014 -0800
> # Branch stable
> # Node ID dcda24083017b829f38f8f58a96704f3a72e4961
> # Parent  2b1ffaaab01f4068f4e1b1291654bf49d334d5d9
> rebase: ignore negative state when updating back to original wc parent

Queued for stable, thanks.

-- 
Mathematics is the supreme nostalgia of our time.