[PATCH 3 of 4] merge: allow passing in a memctx with the rctx argument (RFC DO NOT COMMIT)

Sean Farley sean.michael.farley at gmail.com
Wed Aug 20 14:59:55 CDT 2014


Pierre-Yves David writes:

> On 08/18/2014 07:42 PM, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean.michael.farley at gmail.com>
>> # Date 1407357667 18000
>> #      Wed Aug 06 15:41:07 2014 -0500
>> # Node ID ed4082b72da600548d6c9ecec102a3639e9bf3e0
>> # Parent  d1a21cc0bc4ba5764a1f8760fd041a91939b4d00
>> merge: allow passing in a memctx with the rctx argument (RFC DO NOT COMMIT)
>>
>> This is a hack to do an in-memory merge without changing too much code. Future
>> patches will instead extract the parts of merge.update so that a cleaner
>> approach can be used without changing the signature of the function.
>
> I do not see this patch are specifically dirty. You are adding a new 
> optional argument to specify the "destination" of the merge. Sounds like 
> reasonable. Would just needs some documentation.

It's dirty because it was a quick hack on my part. It also changes the
use of the function. I have since reworked this series so that we don't
need this commit.


More information about the Mercurial-devel mailing list