For anyone else trying to test out this branch I'm able to get the patches to apply cleanly if I check out e.g. commit 92e6a98c3636948e7ece9a3260f9d89dd60da278.
Kevin -- Kevin Burke phone: 925-271-7005 | kevin.burke.dev On Thu, Oct 28, 2021 at 9:31 PM Kevin Burke <ke...@burke.dev> wrote: > Hi all, apologies but I'm having trouble applying the latest patch (v45) > to the latest commit on master (6b0f6f79eef2168ce38a8ee99c3ed76e3df5d7ad) > > I downloaded all of the patches to my local filesystem, and then ran: > > for patch in > ../../kevinburke/rustls-postgres/patchsets/2021-10-05-gustafsson-mailing-list/*.patch; > do git am $patch; done; > > I get the following error on the second patch file: > > Applying: Refactor SSL testharness for multiple library > error: patch failed: src/test/ssl/t/001_ssltests.pl:7 > error: src/test/ssl/t/001_ssltests.pl: patch does not apply > error: patch failed: src/test/ssl/t/SSLServer.pm:26 > error: src/test/ssl/t/SSLServer.pm: patch does not apply > Patch failed at 0001 Refactor SSL testharness for multiple library > hint: Use 'git am --show-current-patch=diff' to see the failed patch > > I believe that these patches need to integrate the refactoring in > commit b3b4d8e68ae83f432f43f035c7eb481ef93e1583 - git is searching for the > wrong text in the existing file, but I'm not sure how to submit a patch > against a patch. > > Thanks, > Kevin > > On Tue, Oct 5, 2021 at 8:05 AM Jacob Champion <pchamp...@vmware.com> > wrote: > >> On Tue, 2021-10-05 at 15:08 +0200, Daniel Gustafsson wrote: >> > Thanks! These changes looks good. Since you accidentally based this >> on v43 >> > and not the v44 I posted with the cryptohash fix in, the attached is a >> v45 with >> > both your v44 and the previous one, all rebased over HEAD. >> >> Thanks, and sorry about that. >> >> --Jacob >> >
