Could someone perhaps manually merge this? We need the backports working to finish this process and get the release out.
On Thu, Mar 31, 2022 at 2:31 AM Daniel Sahlberg <daniel.l.sahlb...@gmail.com> wrote: > > Hi, > > The backport below is stuck. backport.pl reports: > > [[[ > Warning summary > =============== > > 1.14.x-r1881534-no-crlf (Fix issue #4864 "build/ac-macros/macosx.m4: > workaround AC_RUN_IFELSE"): Revisions 'r1881534' nominated but not included > in branch > ]]] > > /Daniel > > Den mån 28 mars 2022 kl 16:22 skrev <markp...@apache.org>: >> >> Author: markphip >> Date: Mon Mar 28 14:22:47 2022 >> New Revision: 1899311 >> >> URL: http://svn.apache.org/viewvc?rev=1899311&view=rev >> Log: >> * STATUS: Vote for r1881534 approving (remove previous nomination) >> >> Modified: >> subversion/branches/1.14.x/STATUS >> >> Modified: subversion/branches/1.14.x/STATUS >> URL: >> http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899311&r1=1899310&r2=1899311&view=diff >> ============================================================================== >> --- subversion/branches/1.14.x/STATUS (original) >> +++ subversion/branches/1.14.x/STATUS Mon Mar 28 14:22:47 2022 >> @@ -32,18 +32,6 @@ Candidate changes: >> Votes: >> +1: futatuki, stsp >> >> - * r1881534 >> - Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE" >> - Justification: >> - Unblocks cross-compiling SVN. >> - Notes: >> - Replacement for veto-blocked r1881534 group (see below) without the >> - inconsistent line endings that instigated said veto blockage. >> - Branch: >> - 1.14.x-r1881534-no-crlf >> - Votes: >> - +1: hartmannathan, stsp >> - >> * r1890223, r1890668, r1890673 >> Support building on Win64/ARM64. >> Justification: >> @@ -64,17 +52,6 @@ Candidate changes: >> Veto-blocked changes: >> ===================== >> >> - * r1881534, r1883388 >> - Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE" >> - Justification: >> - Unblocks cross-compiling SVN. >> - Notes: >> - Replacement nomination above (the 1.14.x-r1881534-no-crlf branch) >> - Votes: >> - +1: hartmannathan >> - -1: brane (contains CRLF line endings, needs svn:eol-style + fixup) >> - (+1 once that is fixed) >> - >> * r1897441 >> swig-py: Fix cleanup failing in unit tests with Python 3 on Windows. >> Justification: >> @@ -122,3 +99,15 @@ Approved changes: >> Reduce code duplication between APR and SVN. >> Votes: >> +1: brane, jun66j5, markphip >> + >> + * r1881534 >> + Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE" >> + Justification: >> + Unblocks cross-compiling SVN. >> + Notes: >> + Replacement for veto-blocked r1881534 group (see below) without the >> + inconsistent line endings that instigated said veto blockage. >> + Branch: >> + 1.14.x-r1881534-no-crlf >> + Votes: >> + +1: hartmannathan, stsp, markphip >> >>
