[PATCH 06 of 12] histedit: simplify computation of `newchildren` during --continue
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Thu Sep 27 17:42:59 CDT 2012
On 27 sept. 2012, at 23:06, Matt Mackall wrote:
> 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
Woups, I totally missed this error messages while checking this series.
Will resend a new version soon.
--
Pierre-Yves
More information about the Mercurial-devel
mailing list