[PATCH 5 of 5 STABLE] bookmark: prevent crashing when a successor is unknown locally (issue3680)

David M. Carr david at carrclan.us
Thu Oct 25 09:21:02 CDT 2012


On Thu, Oct 25, 2012 at 10:18 AM, Pierre-Yves David
<pierre-yves.david at logilab.fr> wrote:
> On Thu, Oct 25, 2012 at 08:40:37AM -0500, Augie Fackler wrote:
>>
>> On Oct 24, 2012, at 5:32 PM, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
>>
>> > # HG changeset patch
>> > # User Pierre-Yves David <pierre-yves.david at logilab.fr>
>> > # Date 1351094342 -7200
>> > # Branch stable
>> > # Node ID 068e0c5b23aab7123609c4ed3b6dfcd35ec72d58
>> > # Parent  bbf650099da1cb369cf76c3f5fdea0fef9da9ef3
>> > bookmark: prevent crashing when a successor is unknown locally (issue3680)
>> >
>> > The `%ln` revset substitution does not accept unknown node. We prune unknown
>> > node from potential successors before computing descendants.
>> >
>> > Computing the set of known node is convoluted because changelog have not cheap
>> > was to get all nodes in a repo.
>>
>>
>> > +++ b/tests/test-bookmarks-pushpull.t
>> > @@ -262,7 +262,8 @@
>> >   4efff6d98829d9c824c621afd6e3f01865f5439f
>> >   $ hg id --debug -r 5
>> >   c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
>> > -  $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f 4efff6d98829d9c824c621afd6e3f01865f5439f
>> > +  $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
>> > +  $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
>>
>> Likely stupid question: why are there nodes here that are all c?
>
> the c...c commit is an imaginary node unknown locally which make the link
> between f6fc62dde3c0771e29704af56ba4d8af77abcc2f and
> 4efff6d98829d9c824c621afd6e3f01865f5439f
>
> f6fc6 -> ccccc -> 4efff
>
>
> --
> Pierre-Yves David
>
> http://www.logilab.fr/
>
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
>
> iEYEARECAAYFAlCJSkUACgkQElczi7p/bN9nwwCggDaCmumehEAvRFmJn37Mh7zO
> wvUAoKH8cYwgeopBK759o6S9CpXFmpR1
> =HJRh
> -----END PGP SIGNATURE-----
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

Note that in this test, we also have a..a and b..b for what appears to
be a similar purpose: to test the behavior with obsolete markers for
unknown nodes.

-- 
David M. Carr
david at carrclan.us


More information about the Mercurial-devel mailing list