MercurialQueues patch merging broken?
Patrick Mézard
pmezard at gmail.com
Sun May 13 22:36:54 UTC 2007
Giorgos Keramidas a écrit :
> With a recent crew build, I see the following when trying to rebase an
> MQ patch queue:
[...]
>
> This seems to have been broken recently, as I have used the same
> sequence of steps to rebase MQ patchsets several times in the past,
> without this sort of error :-(
I first thought I broke it with:
<http://hg.intevation.org/mercurial/crew/rev/f700ea2b0689>
(because the repo looks good before this point wrt mq merge)
but I did not touch the series_end() method. You might want to bisect
around:
<http://hg.intevation.org/mercurial/crew/rev/0532491f7476> instead.
What happens is the status file is incorrect after qpush+merge. It might
be caused by the mq markers which make q.applied having elements not
belonging to q.series.
I will try to dig it tomorrow.
--
Patrick Mézard
More information about the Mercurial-devel
mailing list