On 15 February 2016 at 09:03, Junio C Hamano wrote:
> Felipe Gonçalves Assis writes:
>
>> However, if you do find this approach acceptable/desirable
>> (rename-threshold > 100%), I can work on the issues pointed out and
>> propose a proper patch.
>
> The caller asks diffcore-rename to detect rena
Felipe Gonçalves Assis writes:
> However, if you do find this approach acceptable/desirable
> (rename-threshold > 100%), I can work on the issues pointed out and
> propose a proper patch.
The caller asks diffcore-rename to detect rename, and the algorithm
compares things to come up with a simila
On 15 February 2016 at 06:06, Johannes Schindelin
wrote:
> Hi Felipe,
>
> On Sun, 14 Feb 2016, Felipe Gonçalves Assis wrote:
>
>> Attached is a quick and dirty patch that emulates the effect by
>> allowing greater than 100% rename thresholds to mean "no-renames".
>
> It is really hard to comment o
Johannes Schindelin writes:
> On Sun, 14 Feb 2016, Junio C Hamano wrote:
>
>> Felipe Gonçalves Assis writes:
>>
>> > The usual workaround is using the resolve strategy, but apparently it
>> > ignores the custom merge driver.
>>
>> Hmph.
>>
>> Indeed, git-merge-file seems to call xdl_merge() d
Hi Junio,
On Sun, 14 Feb 2016, Junio C Hamano wrote:
> Felipe Gonçalves Assis writes:
>
> > The usual workaround is using the resolve strategy, but apparently it
> > ignores the custom merge driver.
>
> Hmph.
>
> Indeed, git-merge-file seems to call xdl_merge() directly, bypassing
> the ll_me
Hi Felipe,
On Sun, 14 Feb 2016, Felipe Gonçalves Assis wrote:
> Attached is a quick and dirty patch that emulates the effect by
> allowing greater than 100% rename thresholds to mean "no-renames".
It is really hard to comment on attached patches.
First comment: the commit message is awfully emp
Felipe Gonçalves Assis writes:
> The usual workaround is using the resolve strategy, but apparently it
> ignores the custom merge driver.
Hmph.
Indeed, git-merge-file seems to call xdl_merge() directly, bypassing
the ll_merge(), which is understandable as the former predates the
latter. That n
Hi,
I would like to set up a Git repository with a custom merge driver,
and then disable rename detection when merging.
Unfortunately, the recursive strategy has no "no-renames" option. Note
that I would like to avoid rename detection even when the file
contents perfectly match.
The usual workar
8 matches
Mail list logo