[PATCH 1 of 7] histedit: simplify computation of `newchildren` during --continue

Augie Fackler raf at durin42.com
Mon Oct 1 16:43:18 CDT 2012


On Mon, Oct 1, 2012 at 4:37 PM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
> On 1 oct. 2012, at 20:19, Augie Fackler wrote:
>
>> On Sep 27, 2012, at 6:07 PM, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
>>
>>> +    # is there any new commit between the expected parent and "."
>>> +    # XXX does not take non linear new change in account (but previous
>>> +    # XXX implementation didn't used them anyway
>>
>> Perhaps we should abort here if that happens? Does that seem reasonable?
>
> I'm not sure it's reasonable to Abort. It could be a valid usage from people who want to extract an independent changes in another branches. There is no related bug in the bug tracker so user does not run over it on their own.

If we don't handle the case, why don't we abort then with "unsupported
use case, file a bug" or something? My point is mostly that if we're
going to have these XXX comments, I'd rather have something more
defensive now that we've noticed the potential defect.

>
>> (This case never occurred to me.)
>
> As this case was not handled before, my approach was to keep ignoring the case in this series.
>
> We can keep discussing this while moving to the initial goal for this series. obsolescence support for histedit.
>
> --
> Pierre-Yves David


More information about the Mercurial-devel mailing list