[PATCH] rebase: --abort doesn't strip away the target changeset (issue2220)

Matt Mackall mpm at selenic.com
Wed Jun 9 13:21:56 CDT 2010


On Tue, 2010-06-08 at 18:18 +0200, Stefano Tortarolo wrote:
> # HG changeset patch
> # User Stefano Tortarolo <stefano.tortarolo at gmail.com>
> # Date 1276012867 -7200
> # Node ID fffc9a60ba9607fda2ae316e80bfbc275decc62e
> # Parent  7f72031d4047624271cd90d1396a0bf2709c29e9
> rebase: --abort doesn't strip away the target changeset (issue2220)
> 
> When a changeset is skipped, rebase keeps the previous target as next
> target and if the skipped cset is the first one, the recorded target is
> actually the original target.
> --abort did not detect this situation but simply stripped away the cset.

Applied, thanks.


-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list