Daniel Sahlberg wrote on Wed, Mar 30, 2022 at 07:45:01 +0200: > So.. backports failed today as well. After some digging I realised > backport.pl didn't pick up the branch in this nomination due to a > whitespace issue in STATUS. I removed one space character on each line and > the backport worked. > > However one backport remains in STATUS: > > svnsvn@svn-qavm1:~/src/svn/1.14.x$ for i in ~/src/svn/1.*.x; do cd $i && > $SVN up -q --non-interactive && YES=1 MAY_COMMIT=1 ../trunk/tools/dist/ > backport.pl; done > 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 > svnsvn@svn-qavm1:~/src/svn/1.14.x$ > > Can someone check it? I'm ENOTIME to dig into it. >
The merge of r1881534 to its backport branch did not add that revision to svn:mergeinfo. Which is to say, the error message is correct. (I already pointed this out in <https://mail-archives.apache.org/mod_mbox/subversion-dev/202203.mbox/%3C20220327184456.GA7687%40tarpaulin.shahaf.local2%3E>, though admittedly not too visibly.) Cheers, Daniel > Kind regards, > Daniel > > > Den ons 30 mars 2022 kl 07:41 skrev <dsahlb...@apache.org>: > > > Author: dsahlberg > > Date: Wed Mar 30 05:41:19 2022 > > New Revision: 1899373 > > > > URL: http://svn.apache.org/viewvc?rev=1899373&view=rev > > Log: > > * STATUS: Adjust whitespace to see if it resolves backport issues > > > > 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=1899373&r1=1899372&r2=1899373&view=diff > > > > ============================================================================== > > --- subversion/branches/1.14.x/STATUS (original) > > +++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:41:19 2022 > > @@ -46,13 +46,13 @@ Approved changes: > > ================= > > > > * r1899227 > > - Don't show unreadable copyfrom paths in 'svn log -v' > > - Justification: > > - Makes 'svn log -v' consistent with spec. > > - Branch: > > - 1.14.x-r1899227 > > - Votes: > > - +1: hartmannathan, dsahlberg, rhuijben > > + Don't show unreadable copyfrom paths in 'svn log -v' > > + Justification: > > + Makes 'svn log -v' consistent with spec. > > + Branch: > > + 1.14.x-r1899227 > > + Votes: > > + +1: hartmannathan, dsahlberg, rhuijben > > > > * r1898633 > > Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure > > > > > >