public inbox for [email protected]
help / color / mirror / Atom feedFrom: Jelte Fennema-Nio <[email protected]>
To: Tom Lane <[email protected]>
Cc: vignesh C <[email protected]>
Cc: PostgreSQL Hackers <[email protected]>
Cc: Jacob Brazeal <[email protected]>
Subject: Re: Commitfest app release on Feb 17 with many improvements
Date: Fri, 7 Mar 2025 00:48:36 +0100
Message-ID: <CAGECzQQ+ZxgJaCb3w+hKbcZfwZwZ=-_0G8_06xZA5AF3c0mn8A@mail.gmail.com> (raw)
In-Reply-To: <CAGECzQRymvgXB9coGuGe7JY_qKWO2hcgVXDETrMEGOSfzKsTvg@mail.gmail.com>
References: <CAGECzQTbHhaZMY-=Y=OGMU_jik4MqCfsc7rDf6AnT=Aq-B6cZA@mail.gmail.com>
<CALDaNm3ta7UV_eD+ObgVsivGgPZSj1YqnO4-ojeBz10J95u7_A@mail.gmail.com>
<CAGECzQSE7igwsTUk17i+RNEUL1zR-Zkp-1Zs7KkhmBxAu_Fksw@mail.gmail.com>
<[email protected]>
<CAGECzQRymvgXB9coGuGe7JY_qKWO2hcgVXDETrMEGOSfzKsTvg@mail.gmail.com>
On Thu, 6 Mar 2025 at 18:39, Jelte Fennema-Nio <[email protected]> wrote:
>
> On Thu, 6 Mar 2025 at 18:10, Tom Lane <[email protected]> wrote:
> > Please see if you can make it use patch(1). IME git is too
> > stiff-necked about slightly stale patches no matter which
> > subcommand you use.
>
> It was using patch(1) in the past for that reason, but with --3way I
> was able to get "git apply" to apply patches that patch(1) was unable
> to apply. Also with the git command you get much more useful conflict
> output.
Okay, I went for the approach of just trying everything until one
works. Starting with "git am", then patch(1), and as a final attempt
"git apply". Patch 5272 applies correctly now. I've removed any
backoff caused by repeated failures for all existing patches, so all
should be retried in the next ~48 hours.
view thread (35+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected], [email protected]
Subject: Re: Commitfest app release on Feb 17 with many improvements
In-Reply-To: <CAGECzQQ+ZxgJaCb3w+hKbcZfwZwZ=-_0G8_06xZA5AF3c0mn8A@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox