Author: dsahlberg
Date: Sat Apr 19 22:52:10 2025
New Revision: 1925159
URL: http://svn.apache.org/viewvc?rev=1925159&view=rev
Log:
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
Modified:
subversion/trunk/tools/dist/README.backport
Modified: subversion/trunk/tools/dist/README.backport
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/README.backport?rev=1925159&r1=1925158&r2=1925159&view=diff
==============================================================================
--- subversion/trunk/tools/dist/README.backport (original)
+++ subversion/trunk/tools/dist/README.backport Sat Apr 19 22:52:10 2025
@@ -5,7 +5,7 @@ There two primary functions:
F1. Auto-merge bot; the nightly svn-role commits.
-F2. Conflicts detector bot; the svn-backport-conflicts-1.9.x buildbot task.
+F2. Conflicts detector bot; the backportbot GitHub Action.
And two interactive functions¹:
@@ -29,10 +29,10 @@ backport_tests_pl.py:
backport/*.py:
- New Python-based library implementation of STATUS parsing (status.py) and
- of merging nominated revisions (merger.py). Colloquially referred to as
- 'backport.py', even though there is no script by that name. Written in
- Python 3.
+ New Python-based library implementation of STATUS parsing (status.py),
+ of merging nominated revisions (merger.py) and some WC helper functions
+ (wc.py). Colloquially referred to as 'backport.py', even though there is
+ no script by that name. Written in Python 3.
The modules include their unit tests, see 'python3 -munittest
backport.status' and 'python3 -munittest backport.merger'. However,
@@ -48,6 +48,9 @@ merge-approved-backports.py:
automatically merge approved backports, see documentation in PMC private
repo.
+manage-backports.py:
+ Implementation of [F3] using backport.py.
+
nominate-backport.py:
Implementation of [F4] using backport.py.
@@ -75,10 +78,8 @@ All scripts can be run with '--help' to
backport.pl is considered deprecated since backport.py is better architected
and is written in a language that many more active developers are comfortable
with. The unattended jobs [F1] and [F2] have been converted to using
-backport.py. The interactive
-versions [F3] and [F4] are still in active use, however, so the physical
-backport.pl script should be kept around until Python versions of these are
-available.
+backport.py. Since interactive versions of [F3] and [F4] are now available
+based on backport.py, backport.pl will be removed in Subversion 1.16.
TODO: document that "Notes: ... --accept=foo ..." is parsed, see
backport_tests.py #3.
