Mark Phippard wrote on Sun, Mar 27, 2022 at 13:56:51 -0400: > On Sun, Mar 27, 2022 at 1:45 PM Daniel Sahlberg > <daniel.l.sahlb...@gmail.com> wrote: > > > > Den sön 27 mars 2022 kl 19:33 skrev Daniel Shahaf <d...@daniel.shahaf.name>: > >> > >> It's not mutually exclusive; someone can run the script locally. I'd > >> recommend > >> to run merge-approved-backport.py without arguments. > > > > > > Fails for me: > > [[[ > > $ ./tools/dist/merge-approved-backports.py > > Failed to parse entry ' * r1881534 (without CRLF problem)\n > > [...] > > ]]] > > > > I'm not sure if this is also causing problems for backports.pl.
Apparently not: > % ../trunk/tools/dist/backport.pl CRLF > > > === Candidate changes: > > > Skipping r1877310 (doesn't match pattern): > Add a test for issue #4711 "invalid xml file produced by svn log --xml[...] > > > Skipping r1883355 (doesn't match pattern): > Use the APR-1.4+ API for flushing file contents to disk. > > > Skipping the r1878379 group (doesn't match pattern): > Distinguish configure scripts on release mode and non release mode. > > > >>> The 1.14.x-r1881534-no-crlf branch: > ^/subversion/branches/1.14.x-r1881534-no-crlf > > r1881534 (without CRLF problem) > Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE" > > +1: hartmannathan, stsp > > Run a merge? [y,l,v,±1,±0,q,e,a, ,N,?] y > Would have committed: > [[[ > M . > M build/ac-macros/macosx.m4 > M STATUS (not shown in the diff) > Merge the 1.14.x-r1881534-no-crlf branch: > > * r1881534 (without CRLF problem) > 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 > ]]] > Would remove merged '1.14.x-r1881534-no-crlf' branch > Shall I open a subshell? [ydN?] y > > % svn diff --depth=empty > Index: . > =================================================================== > --- . (revision 1899259) > +++ . (working copy) > > Property changes on: . > ___________________________________________________________________ > Modified: svn:mergeinfo > ## -0,0 +0,1 ## > Merged /subversion/branches/1.14.x-r1881534-no-crlf:r1885959-1899259 So, yeah, could do the merges with backport.pl instead. That'd be «YES=1 MAY_COMMIT=1 …/backport.pl». (That's all documented in README.backport and in the script's --help.) Note there is no "Merged /subversion/trunk:…" line in the diff. That's because the merge of r1881534 to its backport branch (r1885960) didn't include a mergeinfo change to the branch root. > Guess we should just remove " (without CRLF problem)" from that line > to fix the problem. Or this, as I see Nathan has done. I guess backport.pl shouldn't complain about parentheticals in the bullet line when there's a "Branch:" header. Cheers, Daniel
