[PATCH 06 of 12] histedit: simplify computation of `newchildren` during --continue

Matt Mackall mpm at selenic.com
Thu Sep 27 16:06:35 CDT 2012


On Thu, 2012-09-27 at 14:23 +0200, pierre-yves.david at logilab.fr wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1348746916 -7200
> # Node ID 5e47f33617804b53ae125f042d8e9a5dd8cac822
> # Parent  395622e18051ea08908bcb745ac6cef41b967c5c
> histedit: simplify computation of `newchildren` during --continue
> +  abort: Current working direct parents is not a descendant of 055a42cdd887
> +  (update backto the proper location and type rebase --continue again)

"_C_urrent"? "working direct"? "parents is"? "backto"? "type rebase" ?

$ rebase
bash: rebase: command not found

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list