[PATCH 3 of 5 v2] summary: report other parent from mergestate

timeless timeless at gmail.com
Wed Mar 30 14:00:25 EDT 2016


backout, update, and unshelve.

I've updated the commit message, but I'll wait to resend on you
deciding what I should do w/ 4 of 5 ...

On Tue, Mar 29, 2016 at 2:32 PM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 03/22/2016 08:23 PM, timeless wrote:
>>
>> # HG changeset patch
>> # User timeless <timeless at mozdev.org>
>> # Date 1458698262 0
>> #      Wed Mar 23 01:57:42 2016 +0000
>> # Node ID 4bff81fb8154285cf1c9a335d6700eab7cc81bb1
>> # Parent  a0537de695eedc01bd2e3dc847324b8d01b8c0ef
>> summary: report other parent from mergestate
>>
>> In some special instances, mergestate will have an additional
>> parent not reported by `hg parents`, this parent is important,
>> so let's report it.
>>
>> Unfortunately, we can't call it a "parent", so we'll say "source"
>> instead...
>
>
> Do you know what these special cases are? Having some more details would
> help us being confident than 'source' is the right name.
>
> Cheers,
>
> --
> Pierre-Yves David
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list