Skip to content

Commit 54e2d89

Browse files
committed
Update backport README
* tools/dist/README.backport Document the fact that the conflicts detector bot has moved to GHA Document the new wc.py module Document manage-backports.py Document the future removal of backport.pl git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1925159 13f79535-47bb-0310-9956-ffa450edef68
1 parent e3c3b86 commit 54e2d89

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

tools/dist/README.backport

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ There two primary functions:
55

66
F1. Auto-merge bot; the nightly svn-role commits.
77

8-
F2. Conflicts detector bot; the svn-backport-conflicts-1.9.x buildbot task.
8+
F2. Conflicts detector bot; the backportbot GitHub Action.
99

1010
And two interactive functions¹:
1111

@@ -29,10 +29,10 @@ backport_tests_pl.py:
2929

3030

3131
backport/*.py:
32-
New Python-based library implementation of STATUS parsing (status.py) and
33-
of merging nominated revisions (merger.py). Colloquially referred to as
34-
'backport.py', even though there is no script by that name. Written in
35-
Python 3.
32+
New Python-based library implementation of STATUS parsing (status.py),
33+
of merging nominated revisions (merger.py) and some WC helper functions
34+
(wc.py). Colloquially referred to as 'backport.py', even though there is
35+
no script by that name. Written in Python 3.
3636

3737
The modules include their unit tests, see 'python3 -munittest
3838
backport.status' and 'python3 -munittest backport.merger'. However,
@@ -48,6 +48,9 @@ merge-approved-backports.py:
4848
automatically merge approved backports, see documentation in PMC private
4949
repo.
5050

51+
manage-backports.py:
52+
Implementation of [F3] using backport.py.
53+
5154
nominate-backport.py:
5255
Implementation of [F4] using backport.py.
5356

@@ -75,10 +78,8 @@ All scripts can be run with '--help' to display their usage messages.
7578
backport.pl is considered deprecated since backport.py is better architected
7679
and is written in a language that many more active developers are comfortable
7780
with. The unattended jobs [F1] and [F2] have been converted to using
78-
backport.py. The interactive
79-
versions [F3] and [F4] are still in active use, however, so the physical
80-
backport.pl script should be kept around until Python versions of these are
81-
available.
81+
backport.py. Since interactive versions of [F3] and [F4] are now available
82+
based on backport.py, backport.pl will be removed in Subversion 1.16.
8283

8384

8485
TODO: document that "Notes: ... --accept=foo ..." is parsed, see backport_tests.py #3.

0 commit comments

Comments
 (0)