On Tue, 1 May 2018 14:06:12 -0600, Tom Hindle wrote:
> So this would just involve the addition of the ":callable" where one
> would specify a function name?
Yes. I think that's a good practice to confine side-effects to be made
by a merge script.
> One of the reasons I didn't do this, (although
Hi Yuya,
So this would just involve the addition of the ":callable" where one
would specify a function name?
One of the reasons I didn't do this, (although I took the hook's
'python:' part) was because:
If one had something like this:
# HG changeset patch
# User hindlemail
# Date 1523988043 21600
# Tue Apr 17 12:00:43 2018 -0600
# Node ID 279036df5b14e08c09e95222b2dc61b279b5733a
# Parent 92213f6745ed6f2c50feca9a2261b6f33a9a32fa
filemerge: support passing python script to custom merge-tools
Eliminates
On Wed, 18 Apr 2018 07:32:52 -0600, Tom Hindle wrote:
> # HG changeset patch
> # User hindlemail
> # Date 1523988043 21600
> # Tue Apr 17 12:00:43 2018 -0600
> # Node ID 701f7b1145cb8105428141c22260c89d6b942bef
> # Parent 62ebfda864de35f306963989303b70235aa63952
>
> On Apr 18, 2018, at 08:32, Tom Hindle wrote:
>
> # HG changeset patch
> # User hindlemail
> # Date 1523988043 21600
> # Tue Apr 17 12:00:43 2018 -0600
> # Node ID 701f7b1145cb8105428141c22260c89d6b942bef
> # Parent
# HG changeset patch
# User hindlemail
# Date 1523988043 21600
# Tue Apr 17 12:00:43 2018 -0600
# Node ID 701f7b1145cb8105428141c22260c89d6b942bef
# Parent 62ebfda864de35f306963989303b70235aa63952
filemerge: support passing python script to custom merge-tools
Eliminates
# HG changeset patch
# User hindlemail
# Date 1523988043 21600
# Tue Apr 17 12:00:43 2018 -0600
# Node ID 701f7b1145cb8105428141c22260c89d6b942bef
# Parent 62ebfda864de35f306963989303b70235aa63952
filemerge: support passing python script to custom merge-tools