[PATCH] merge.graft: add option to keep second parent

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Dec 7 12:17:34 CST 2015



On 12/04/2015 05:41 PM, Andrew Halberstadt wrote:
> On 04/12/15 08:38 PM, Pierre-Yves David wrote:
>>
>>
>> On 12/04/2015 11:52 AM, Augie Fackler wrote:
>>> On Thu, Dec 03, 2015 at 11:57:45PM -0500, Andrew Halberstadt wrote:
>>>> # HG changeset patch
>>>> # User Andrew Halberstadt <ahalberstadt at mozilla.com>
>>>> # Date 1449201719 18000
>>>> #      Thu Dec 03 23:01:59 2015 -0500
>>>> # Node ID 212f93c2367203cadfd6103f444899929b8643ae
>>>> # Parent  71aa5a26162d6e4a165b68f07b331e3e2eedc117
>>>> merge.graft: add option to keep second parent
>>>
>>> Queued, thanks. Congratulations on your first hg patch.
>>
>> Actually, I'm a bit confused about how just keeping the parent will be
>> enough to the solve the problem we are trying to solve.
>>
>> So I would like to look at it to double check its logic and how it is
>> used in Evolve.
>
> I just submitted the evolve portion of this patch. Please assume I have
> no idea what I'm doing :).

This patch is actually pretty good, nice work.
It is pushed to the clowncopter, (again)

--
Pierre-Yves David


More information about the Mercurial-devel mailing list