File tree 2 files changed +9
-3
lines changed
2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -118,7 +118,13 @@ backport
118
118
--------
119
119
120
120
Script to backport pull requests in order of merge, to minimize number of conflicts.
121
- Pull ids are listed in ` to_backport.txt ` or given on the command line.
121
+ Pull ids are listed in ` to_backport.txt ` or given on the command line, and they must be prefixed
122
+ with the repository name, e.g.:
123
+
124
+ ``` bash
125
+ ../bitcoin-maintainer-tools/backport.py bitcoin/bitcoin#21907 bitcoin-core/gui#277 bitcoin-core/gui#365
126
+
127
+ ```
122
128
123
129
Requires ` pip3 install gitpython ` or similar.
124
130
Original file line number Diff line number Diff line change @@ -22,9 +22,9 @@ def ask_prompt(text):
22
22
print ("" ,file = sys .stderr )
23
23
return reply
24
24
25
- merge_re = re .compile ('^Merge (#[0-9]+)' )
25
+ merge_re = re .compile ('^Merge (\w+(?:-\w+)*/\w+(?:-\w+)* #[0-9]+)' )
26
26
if len (sys .argv ) > 1 :
27
- pulls = ['#' + x .strip () for x in sys .argv [1 :]]
27
+ pulls = [x .strip () for x in sys .argv [1 :]]
28
28
else :
29
29
with open ('to_backport.txt' ,'r' ) as f :
30
30
pulls = [x .strip () for x in f if x .strip ()]
You can’t perform that action at this time.
0 commit comments