From: Phillip Wood <phillip.wood123@gmail.com>
To: Elijah Newren <newren@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Sergey Organov <sorganov@gmail.com>, Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3"
Date: Fri, 24 Sep 2021 11:16:23 +0100 [thread overview]
Message-ID: <3f5e1569-4ccd-8494-ea18-1e00bdc73017@gmail.com> (raw)
In-Reply-To: <CABPp-BFQ8wDinW9MuOU6FuGq_h5W=4nv2hVhO0R6bbCxzv_Vyg@mail.gmail.com>
Hi Elijah
On 18/09/2021 23:04, Elijah Newren wrote:
> Hi Phillip,
> [...]
>> I do wonder (though a brief try failed to trigger it) if there are cases
>> where the diff algorithm does something "clever" which means it does not
>> treat a common prefix or suffix as unchanged (see d2f82950a9
>> ("Re(-re)*fix trim_common_tail()", 2007-12-20) for a related issue). We
>> could just trim the common prefix and suffix from the two sides
>> ourselves using xdl_recmatch().
>
> You seem to understand the xdl stuff much better than I. I'm not sure
> how xdl_recmatch() would be called or where. Would you like to take
> over the patches?
I could do if you really want but I wont have time to do anything for at
least a couple of weeks (I really need to get on top of my current
series before starting anything new). I outlined the rough idea in [1].
tldr; instead of diffing the two sides of the conflict just walk the
start and the end of the two sides until we find a line that does not match.
Best Wishes
Phillip
[1]
https://lore.kernel.org/git/f76c79d6-f280-3011-d88d-6de146977626@gmail.com/
next prev parent reply other threads:[~2021-09-24 10:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 5:16 [PATCH 0/2] RFC: implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-06-15 5:16 ` [PATCH 1/2] xdiff: implement a zealous diff3, or "zdiff3" Elijah Newren via GitGitGadget
2021-06-15 6:13 ` Junio C Hamano
2021-06-15 9:40 ` Felipe Contreras
2021-06-15 18:12 ` Elijah Newren
2021-06-15 18:50 ` Sergey Organov
2021-06-15 5:16 ` [PATCH 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-06-15 6:21 ` Junio C Hamano
2021-06-15 9:43 ` [PATCH 0/2] RFC: implement new zdiff3 conflict style Jeff King
2021-06-15 19:35 ` Elijah Newren
2021-06-16 8:57 ` Phillip Wood
2021-06-16 10:31 ` Jeff King
2021-06-23 9:53 ` Phillip Wood
2021-06-23 22:28 ` Jeff King
2021-06-17 5:03 ` Elijah Newren
2021-06-15 21:36 ` Johannes Sixt
2021-06-15 21:45 ` Elijah Newren
2021-06-16 6:16 ` Johannes Sixt
2021-06-16 8:14 ` Elijah Newren
2021-09-11 17:03 ` [PATCH v2 " Elijah Newren via GitGitGadget
2021-09-11 17:03 ` [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" Elijah Newren via GitGitGadget
2021-09-15 10:25 ` Phillip Wood
2021-09-15 11:21 ` Phillip Wood
2021-09-18 22:06 ` Elijah Newren
2021-09-24 10:09 ` Phillip Wood
2021-09-18 22:04 ` Elijah Newren
2021-09-24 10:16 ` Phillip Wood [this message]
2021-09-11 17:03 ` [PATCH v2 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-09-18 23:02 ` [PATCH v3 0/2] RFC: implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-09-18 23:02 ` [PATCH v3 1/2] xdiff: implement a zealous diff3, or "zdiff3" Elijah Newren via GitGitGadget
2021-09-18 23:02 ` [PATCH v3 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-11-16 2:13 ` [PATCH v4 0/2] Implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-11-16 2:13 ` [PATCH v4 1/2] xdiff: implement a zealous diff3, or "zdiff3" Phillip Wood via GitGitGadget
2021-11-16 2:13 ` [PATCH v4 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-12-01 0:05 ` [PATCH v5 0/2] Implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-12-01 0:05 ` [PATCH v5 1/2] xdiff: implement a zealous diff3, or "zdiff3" Phillip Wood via GitGitGadget
2021-12-01 0:05 ` [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-12-02 8:42 ` Bagas Sanjaya
2021-12-02 13:28 ` Eric Sunshine
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=3f5e1569-4ccd-8494-ea18-1e00bdc73017@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=j6t@kdbg.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sorganov@gmail.com \
/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.