From: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
To: Finn Arne Gangstad <finnag@pvv.org>
Cc: Johannes Sixt <j.sixt@viscovery.net>, git@vger.kernel.org
Subject: Re: [RFC] ll-merge: Normalize files before merging
Date: Fri, 11 Jun 2010 10:47:44 +0200 [thread overview]
Message-ID: <4C11F830.3050404@gmail.com> (raw)
In-Reply-To: <20100611083641.GB31109@pvv.org>
On 11. juni 2010 10:36, Finn Arne Gangstad wrote:
> It would probably be more correct to do
>
> conert_to_git(convert_to_work_tree(x)) for the parts taken from base
> and theirs, in theory I guess that this can be true:
>
> convert_to_git(x) != convert_to_git(convert_to_work_tree(x))
Interesting idea, might be a bit slow perhaps? I'll do some
benchmarketing. Incidentally, it has to convert_to_work_tree() "ours"
as well, since the merge code doesn't read anything from the worktree.
I think convert_to_git(convert_to_work_tree(x)) is actually less likely
to cause trouble than convert_to_git(convert_to_git(x)), which is what
blind normalization would end up doing for at least one side of the merge.
- Eyvind
next prev parent reply other threads:[~2010-06-11 8:47 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 [this message]
2010-06-11 19:44 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C11F830.3050404@gmail.com \
--to=eyvind.bernhardsen@gmail.com \
--cc=finnag@pvv.org \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.