[PATCH 2 of 2] rebase: return early when source is descendant of destination

Matt Mackall mpm at selenic.com
Thu Oct 8 16:38:21 UTC 2009


On Thu, 2009-10-08 at 11:06 +0200, Sune Foldager wrote:
> # HG changeset patch
> # User Sune Foldager <cryo at cyanite.org>
> # Date 1254991183 -7200
> # Node ID de5aff7e38bb657c27dbc4541694d1bd6380c847
> # Parent  bb4c250d4f4c6df5e0601d9983b19c640ddfb1a0
> rebase: return early when source is descendant of destination
> 
> This only happens when using --base (or no source selection options), as
> rebase already aborts in this situation when using --source.
> 
> Without this change you get an abort from the underlying merge, and the
> repository is in a different state than you started with (the working
> dir parent is changed).

Both applied, thanks.

-- 
http://selenic.com : development and support for Mercurial and Linux





More information about the Mercurial-devel mailing list