MIME-Version: 1.0
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>
 <703819.1741281033@sss.pgh.pa.us>
 <CAGECzQRymvgXB9coGuGe7JY_qKWO2hcgVXDETrMEGOSfzKsTvg@mail.gmail.com>
In-Reply-To: 
 <CAGECzQRymvgXB9coGuGe7JY_qKWO2hcgVXDETrMEGOSfzKsTvg@mail.gmail.com>
From: Jelte Fennema-Nio <postgres@jeltef.nl>
Date: Fri, 7 Mar 2025 00:48:36 +0100
Message-ID: 
 <CAGECzQQ+ZxgJaCb3w+hKbcZfwZwZ=-_0G8_06xZA5AF3c0mn8A@mail.gmail.com>
Subject: Re: Commitfest app release on Feb 17 with many improvements
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: vignesh C <vignesh21@gmail.com>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>,
	Jacob Brazeal <jacob.brazeal@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Archived-At: 
 <https://www.postgresql.org/message-id/CAGECzQQ%2BZxgJaCb3w%2BhKbcZfwZwZ%3D-_0G8_06xZA5AF3c0mn8A%40mail.gmail.com>
Precedence: bulk

On Thu, 6 Mar 2025 at 18:39, Jelte Fennema-Nio <postgres@jeltef.nl> wrote:
>
> On Thu, 6 Mar 2025 at 18:10, Tom Lane <tgl@sss.pgh.pa.us> 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.