Stefan, you asked on IRC: > [12:55] <stsp> [...] there's a step marked as "not automated" in > https://subversion.apache.org/docs/community-guide/releasing.html#creating-branch > > [12:56] <stsp> but it seems the step (adding a branch entry to the backport > conflict merge bot) has already happened > > [12:56] <stsp> has this been automated since? i used release.py for everything > > [12:56] <stsp> https://ci.apache.org/builders/svn-backport-conflicts-1.14.x
You've confused two different bots. Setting up the conflicts bot, svn-backport-conflicts-1.14.x, _is_ automated by release.py. HACKING says otherwise (in the antepenultimate bullet of [1]), but is out of date [2]. Setting up the merges bot is currently a manual step, as HACKING correctly describes. Without that step, svn-role nightly merges won't happen for the 1.14.x branch. (That step _could_ be automated — for example, by adding an «svn up --set-depth=infinity ~/src/svn/1.{9..99}.x» cron job — but hasn't been.) See tools/dist/README.backport for an overview of backport.py's different personalities. Cheers, Daniel [1] https://subversion.apache.org/docs/community-guide/releasing.html#creating-branch [2] See r1058284 of https://svn.apache.org/repos/infra/infrastructure/buildbot/aegis/buildmaster/master1/projects/.