On Thu, Jun 22, 2017 at 3:51 PM, Peter Eisentraut
<peter.eisentraut@2ndquadrant.com> wrote:
> On 6/22/17 05:13, Craig Ringer wrote:
>> On 22 June 2017 at 17:00, Kang Yuzhe <tiggreen87@gmail.com> wrote:
>>
>>> diff --git a/src/backend/executor/nodeModifyTable.c
>>> b/src/backend/executor/nodeModifyTable.c
>>> index 8619ce3..e3ac758 100644
>>> --- a/src/backend/executor/nodeModifyTable.c
>>> +++ b/src/backend/executor/nodeModifyTable.c
>>
>> The first entry in the 'index' is the git commit hash of the base commit, IIRC.
> I don't know what the technical term is, but these values are hashes of
> the file before and after, or something like that. They are not Git
> commits or trees.
>
> See git format-patch option --base for how to communicate the base commit.
>
> (The above patch was possibly created from an earlier unofficial Git
> repository, because I can't find those hashes.)
Thanks Peter for trying to help.
According to Thomas Munro advice, I did git log --since="Aug 4 2010"
--until="Aug 29 2010"
Picking random commit which is 005e427a22e3bb7fa01a84a7b476a3d6359a0344, I did
git checkout 005e427a22e3bb7fa01a84a7b476a3d6359a0344.
Next I did git checkout -b pgSQLMerge
And finally I did the following and it worked.
patch -p1 < merge_v201.patch
Regards,
Zeray