[PATCH 2 of 3 v2] bundle: add config option to include phases

Martin von Zweigbergk martinvonz at google.com
Thu Jun 22 16:11:31 UTC 2017


On Thu, Jun 22, 2017 at 8:51 AM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 06/20/2017 07:00 PM, Martin von Zweigbergk via Mercurial-devel wrote:
>>
>> # HG changeset patch
>> # User Martin von Zweigbergk <martinvonz at google.com>
>> # Date 1497939455 25200
>> #      Mon Jun 19 23:17:35 2017 -0700
>> # Node ID 04fa2d783f067765f9d8cf0d1b02fae1819c232e
>> # Parent  0f77eccc602140bd4f8066a196b8ae53c0f50ef9
>> bundle: add config option to include phases
>
> I think the above introduce a bug in case were bundle content as other
> descendant (secret being wrongfully turned to draft).. I'm not seeing the
> case tested so I'll assume it is buggy for now :-p.
>
> Practical example:
>
>   initial state:
>   A(public) - B(draft) - C(draft) - D (secret)
>
>   $ hg bundle --base A --rev B /tmp/babar.hg
>   bundle content:
>     phase-roots:
>       B draft
>
>   $ hg unbundle /tmp/babar.hg
>   algorithm step:
>     makes all added not secret → make B secret → make C secret
>         state: A(public) - B(secret) - C(secret) - D (secret)
>         (no public root, skip)
>         draft root (no secret roots)
>            compute('B:: - ()::') == compute('B::') = B,C,D
>         state: A(public) - B(draft) - C(draft) - D (draft)

Good catch, that was indeed broken. I've dropped the series. I'll
reply to the rest of the comment later.



More information about the Mercurial-devel mailing list