Re: [RFC PATCH v5 2/4] add -p: select modified lines correctly
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 26, 2018, 19:30 UTC
- Message-ID
- <xmqqmuudpzfl.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20180726155854.20832-3-phillip.wood@talktalk.net>
Phillip Wood <phillip.wood@talktalk.net> writes:
An interesting problem you are solving ;-)
Show 16 quoted lines
> For example given the hunk > 1 -* a longer description of the > 2 - first item > 3 -* second > 4 -* third > 5 +* first > 6 + second item > 7 +* the third item > > If the user selects 1,2,4–5,7 then we should generate > -* a longer description of the > - first item > +* first > * second > -* third > +* the third item
I understood this example as "3 that is removal and 6 that is addition are excluded---we consider that these two lines (one in the pre-image and the other in the post-image) are _matching". As we are excluding a deletion, it becomes the common context line, and any removal or addition that appear before that must stay to happen before the common context line (i.e. removal of 1 and 2, and addition of 5, both precede common context line "second") and any removal or addition that appear after that must stay after the common context (i.e. removal of "third" and addition of "the third item" come after "second").
But then it is not clear to me what you mean by "group" below. What groups does the above example have? Ones before the retained "second" (i.e. removal 1, 2, 4 and addition 5) form one group and ones after it (i.e. removal 4 and addition 7) form another group?
> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Is this fixing any bug? I usually see "Reported-by" only for a bugfix patch but this seems to be adding a new feature (and lack of feature is usually not a bug).