From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>, git@vger.kernel.org
Subject: Re: [RFC] ll-merge: Normalize files before merging
Date: Fri, 11 Jun 2010 12:44:55 -0700 [thread overview]
Message-ID: <7vd3vxicaw.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4C11EB0D.20208@viscovery.net> (Johannes Sixt's message of "Fri\, 11 Jun 2010 09\:51\:41 +0200")
Johannes Sixt <j.sixt@viscovery.net> writes:
> Am 6/11/2010 9:34, schrieb Eyvind Bernhardsen:
>> On 11. juni 2010 07:49, Johannes Sixt wrote:
>>> I think you are going overboard here. Normalization should only happen
>>> only for data that moves from the worktree to the database. But during a
>>> merge, at most one part can come from the worktree, methinks; you are
>>> normalizing all three of them, though.
>>
>> Well, that's sort of the point. All three are normalized to (hopefully)
>> minimize the differences between them, increasing the chance of a
>> successful merge.
>
> I know what your point is. It is still inappropriate to call
> normalize_file() on data that comes from the repository. It is not the
> task of a merge procedure to blindly normalize data.
It is not "blindly", but "running normalization one _extra time_, as the
repository data is supposed to be canonical already", which is utterly
wrong.
next prev parent reply other threads:[~2010-06-11 19:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 20:48 [RFC] ll-merge: Normalize files before merging Eyvind Bernhardsen
2010-06-11 5:49 ` Johannes Sixt
2010-06-11 7:34 ` Eyvind Bernhardsen
2010-06-11 7:51 ` Johannes Sixt
2010-06-11 8:36 ` Finn Arne Gangstad
2010-06-11 8:47 ` Eyvind Bernhardsen
2010-06-11 19:44 ` Junio C Hamano [this message]
2010-06-11 20:56 ` Eyvind Bernhardsen
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=7vd3vxicaw.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/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).