[PATCH 2 of 2 V3] rebase: fix crash when rebase aborts while rebasing obsolete revisions

Pierre-Yves David pierre-yves.david at ens-lyon.org
Tue Mar 29 20:19:14 EDT 2016



On 03/29/2016 11:53 AM, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon at fb.com>
> # Date 1459277441 25200
> #      Tue Mar 29 11:50:41 2016 -0700
> # Node ID 4637682a60b5dc020d8548a7608bf9468b578d68
> # Parent  6763719b7f4410240a38f84aace80c3e81e9ff4b
> rebase: fix crash when rebase aborts while rebasing obsolete revisions
>
> Before this patch, rebase --continue would crash when trying to resume a rebase
> of obsolete revisions whose successors were in the destination.
> This patch adds logic to recompute the mapping when rebase is resumed. This
> patch also adds a test that showcased the crash before the code change.

Pushed.

Thanks for taking the time to boil this down to the right approach.

Cheers,

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list