From: Jeff King <peff@peff.net>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: git@vger.kernel.org, kernel@pengutronix.de,
Antoine Pelisse <apelisse@gmail.com>
Subject: Re: [PATCH] xdiff: implement a zealous diff3
Date: Wed, 6 Mar 2013 15:46:12 -0500 [thread overview]
Message-ID: <20130306204612.GA24535@sigill.intra.peff.net> (raw)
In-Reply-To: <1362602202-29749-1-git-send-email-u.kleine-koenig@pengutronix.de>
On Wed, Mar 06, 2013 at 09:36:42PM +0100, Uwe Kleine-König wrote:
> "zdiff3" is identical to ordinary diff3, only it allows more aggressive
> compaction than diff3. This way the displayed base isn't necessary
> technically correct, but still this mode might help resolving merge
> conflicts between two near identical additions.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
I think the patch is correct, assuming this is the interface we want.
It would be more flexible instead to have:
1. user can configure zealous-level of merge via command-line or
config (they cannot control it at all right now)
2. when diff3 is used and no level is explicitly given, do not go
above EAGER
3. otherwise, respect the level given by the user, even if it is
ZEALOUS
But that would involve a lot of refactoring. I don't know if it is worth
the effort (the bonus is that people can then set the level
independently, but I do not know that anyone ever wants to do that).
> builtin/merge-file.c | 2 ++
> contrib/completion/git-completion.bash | 2 +-
> xdiff-interface.c | 2 ++
> xdiff/xdiff.h | 1 +
> xdiff/xmerge.c | 8 +++++++-
> 5 files changed, 13 insertions(+), 2 deletions(-)
I think this would need documentation not only to let users know about
the feature, but also to warn them of the caveats.
-Peff
next prev parent reply other threads:[~2013-03-06 20:46 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 15:05 feature suggestion: optimize common parts for checkout --conflict=diff3 Uwe Kleine-König
2013-03-06 18:27 ` Antoine Pelisse
2013-03-06 19:26 ` Antoine Pelisse
2013-03-06 20:03 ` Jeff King
2013-03-06 20:36 ` [PATCH] xdiff: implement a zealous diff3 Uwe Kleine-König
2013-03-06 20:46 ` Jeff King [this message]
2013-03-06 20:40 ` feature suggestion: optimize common parts for checkout --conflict=diff3 Junio C Hamano
2013-03-06 20:54 ` Jeff King
2013-03-06 21:09 ` Junio C Hamano
2013-03-06 21:21 ` Jeff King
2013-03-06 21:50 ` Junio C Hamano
2013-03-07 1:02 ` Jeff King
2013-03-06 21:31 ` Uwe Kleine-König
2013-03-06 21:32 ` Junio C Hamano
2013-03-07 8:04 ` Jeff King
2013-03-07 17:26 ` Junio C Hamano
2013-03-07 18:01 ` Jeff King
2013-03-07 18:40 ` Junio C Hamano
2013-03-07 18:50 ` Jeff King
2013-04-04 20:33 ` Jeff King
2013-04-04 20:49 ` Uwe Kleine-König
2013-04-04 20:54 ` Jeff King
2013-04-04 21:19 ` Junio C Hamano
2013-03-07 18:21 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2021-06-13 14:31 [PATCH] xdiff: implement a zealous diff3 Felipe Contreras
2021-06-13 15:42 ` Jeff King
2021-06-13 18:00 ` Felipe Contreras
2021-06-13 21:24 ` Felipe Contreras
2021-06-15 2:07 ` Junio C Hamano
2021-06-15 3:43 ` Elijah Newren
2021-06-15 4:03 ` Junio C Hamano
2021-06-15 9:20 ` Felipe Contreras
2021-06-15 9:16 ` Felipe Contreras
2021-06-15 16:59 ` Elijah Newren
2021-06-14 4:44 ` Jeff King
2021-06-15 4:19 ` Felipe Contreras
2021-06-15 9:24 ` Jeff King
2021-06-15 10:24 ` Felipe Contreras
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=20130306204612.GA24535@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=u.kleine-koenig@pengutronix.de \
/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).