From: Junio C Hamano <gitster@pobox.com>
To: "Philip Oakley" <philipoakley@iee.org>
Cc: "Git List" <git@vger.kernel.org>
Subject: Re: mergetool: what to do about deleting precious files?
Date: Sun, 28 May 2017 22:06:03 +0900 [thread overview]
Message-ID: <xmqqpoet9lms.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <D689F4F80DA24C78B5E0FB025B9548E6@PhilipOakley> (Philip Oakley's message of "Sun, 28 May 2017 11:24:43 +0100")
"Philip Oakley" <philipoakley@iee.org> writes:
>> So I do not think this is not limited to "new file". Anything that
>> a tree-level three-way merge would resolve cleanly without having to
>> consult the content-level three-way merge will complete without
>> consulting the merge.ours.driver; per-file content-level three-way
>> merge driver (which is what merge=<drivername> mechanism lets you
>> specify via the attributes mechanism) is not something you would
>> want to use for this kind of thing. It is purely for resolving the
>> actual content-level conflicts.
>>
> That (that Git knows best) sounds just wrong.
Don't twist my words. I never said Git knows best.
The user-level merge driver is a mechanism to affect conflict level
three-way merges. The interface to the content level three-way
merge driver feeds three versions of blobs and the driver is
expected to give a merged result. The interface as designed is
incapable of passing "here is the common ancestor", "our side is
missing" and "their side is this content".
So if we want a mechanism that can affect the outcome of tree-level
three-way merge, we need a _new_ mechanism. The existing merge
drivers that are written by end users (at least the ones written
correctly to the spec, anyway) are not expecting to be called with
"in our tree, there is no blob here", and trying to piggyback on it
will break existing users.
next prev parent reply other threads:[~2017-05-28 13:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-27 10:03 mergetool: what to do about deleting precious files? Philip Oakley
2017-05-28 1:14 ` Junio C Hamano
2017-05-28 10:24 ` Philip Oakley
2017-05-28 13:06 ` Junio C Hamano [this message]
2017-05-29 12:57 ` Philip Oakley
2017-05-30 0:52 ` Junio C Hamano
2017-05-30 23:04 ` Philip Oakley
2017-05-31 0:02 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpoet9lms.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).