Re: please help backporting some patches to stable release 19.11.12 - part II

[Josh Soref <jsoref@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1857 bytes --]

On Wed, Mar 9, 2022, 2:49 AM Christian Ehrhardt <
christian.ehrhardt@canonical.com> wrote:

> On Fri, Feb 25, 2022 at 6:54 PM Josh Soref <jsoref@gmail.com> wrote:
> >
> > Christian Ehrhardt wrote:
> >
> > Hi commit authors (and maintainers),
> >
> > Despite being selected by the DPDK maintenance tool
> ./devtools/git-log-fixes.sh
> > I didn't apply following commits from DPDK main to 19.11
> > stable branch, as conflicts or build errors occur.
> >
> > Can authors check your patches in the following list and either:
> >     - Backport your patches to the 19.11 branch, or
> >     - Indicate that the patch should not be backported
> >
> >
> > My spelling work can be safely skipped.
>
> Thank you for the FYI
>
> Maybe to everyone let me explain the reason why we even try :-)
> In general those kinds of fixes are not "too important" but if they
> can be applied it keeps the amount of extra churn lower later on.
> Imagine you touch every string with a commit, afterwards nothing will
> apply automatically anymore.
> So sometimes backporting those changes even if they feel "not
> important" can help.
>

Fair. Perhaps my message was a bit flippant. In general my changes are both
not important and also fairly easy to backport. If you need help, I could
probably allocate time to do it.

I've recently grown to love Visual Studio Code's conflict handling. If my
commits still have the original commit message (can't remember if they do
here, probably not, but I could start from the branch that did), while
rebasing I can select the word that the commit says was the replacement in
the `>>>>>> spelling: ...` line, and it'll highlight the matches within the
`<<<<<<` / `========` parts, and then I can visually identity which aren't
in the former and copy up the fixes from the lower part. And then I click
the accept link to keep the top part.

>

[-- Attachment #2: Type: text/html, Size: 2688 bytes --]