From: Junio C Hamano <gitster@pobox•com>
To: Jonathan Tan <jonathantanmy@google•com>
Cc: git@vger•kernel.org
Subject: Re: [RFC PATCH] xdiff/xpatience: support anchoring a line
Date: Wed, 22 Nov 2017 11:27:59 +0900 [thread overview]
Message-ID: <xmqqwp2jvyhc.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171121221717.155301-1-jonathantanmy@google.com> (Jonathan Tan's message of "Tue, 21 Nov 2017 14:17:17 -0800")
Jonathan Tan <jonathantanmy@google•com> writes:
> Teach the patience diff to support prohibiting a user-specified line
> from appearing as a deletion or addition in the end result.
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google•com>
> ---
> I'm sending this out to see if a change similar to this would be
> welcome. It is useful to me as a reviewer (to check my own code, e.g.
> when checking [1]). Probably more design needs to go into this,
> including the best way to specify the "anchor" line, and the correct
> behavior when the anchor is either not found or appears more than once.
>
> Any thoughts?
This is a natural extension of the idea the patience algorithm is
built upon. If this were a cumulative command line option that can
be given to specify multiple lines and can be used across the diff
family, it would make a welcome addition, I would think.
next prev parent reply other threads:[~2017-11-22 2:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 22:17 [RFC PATCH] xdiff/xpatience: support anchoring a line Jonathan Tan
2017-11-21 23:28 ` Stefan Beller
2017-11-22 2:27 ` Junio C Hamano [this message]
2017-11-22 23:41 ` [PATCH] xdiff/xpatience: support anchoring line(s) Jonathan Tan
2017-11-23 0:15 ` Stefan Beller
2017-11-23 2:05 ` Junio C Hamano
2017-11-23 2:16 ` Junio C Hamano
2017-11-23 2:47 ` Junio C Hamano
2017-11-27 18:30 ` Jonathan Tan
2017-11-27 19:47 ` [PATCH v2] diff: " Jonathan Tan
2017-11-28 1:38 ` Junio C Hamano
2017-11-28 18:47 ` [PATCH v3] " Jonathan Tan
2017-11-30 0:36 ` Johannes Schindelin
2017-11-30 23:26 ` Jonathan Tan
2017-12-04 19:45 ` Stefan Beller
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=xmqqwp2jvyhc.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jonathantanmy@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox