Raw error output:
Aborting, could not apply patch buffer for 280599.
Error running git command; sanitised_command=['git', 'cherry-pick', 'e13e3a6b642fa3bd2c5b05f5dfbeac28d434a252'], path='/files/repos/firefox-esr115', Performing inexact rename detection: 18% (18699/99426)
Performing inexact rename detection: 19% (18891/99426)
Performing inexact rename detection: 20% (19887/99426)
Performing inexact rename detection: 21% (20880/99426)
Performing inexact rename detection: 22% (21876/99426)
Performing inexact rename detection: 23% (22869/99426)
Performing inexact rename detection: 24% (23865/99426)
Performing inexact rename detection: 25% (24858/99426)
Performing inexact rename detection: 26% (25851/99426)
Performing inexact rename detection: 27% (26847/99426)
Performing inexact rename detection: 28% (27840/99426)
Performing inexact rename detection: 29% (28836/99426)
Performing inexact rename detection: 30% (29829/99426)
Performing inexact rename detection: 31% (30825/99426)
Performing inexact rename detection: 32% (31818/99426)
Performing inexact rename detection: 33% (32811/99426)
Performing inexact rename detection: 34% (33807/99426)
Performing inexact rename detection: 35% (34800/99426)
Performing inexact rename detection: 36% (35796/99426)
Performing inexact rename detection: 37% (36789/99426)
Performing inexact rename detection: 38% (37782/99426)
Performing inexact rename detection: 39% (38778/99426)
Performing inexact rename detection: 40% (39771/99426)
Performing inexact rename detection: 41% (40767/99426)
Performing inexact rename detection: 41% (41169/99426)
Performing inexact rename detection: 42% (41760/99426)
Performing inexact rename detection: 43% (42756/99426)
Performing inexact rename detection: 44% (43749/99426)
Performing inexact rename detection: 45% (44742/99426)
Performing inexact rename detection: 46% (45738/99426)
Performing inexact rename detection: 47% (46731/99426)
Performing inexact rename detection: 48% (47727/99426)
Performing inexact rename detection: 49% (48720/99426)
Performing inexact rename detection: 50% (49713/99426)
Performing inexact rename detection: 51% (50709/99426)
Performing inexact rename detection: 52% (51702/99426)
Performing inexact rename detection: 53% (52698/99426)
Performing inexact rename detection: 54% (53691/99426)
Performing inexact rename detection: 55% (54687/99426)
Performing inexact rename detection: 56% (55680/99426)
Performing inexact rename detection: 57% (56673/99426)
Performing inexact rename detection: 58% (57669/99426)
Performing inexact rename detection: 59% (58662/99426)
Performing inexact rename detection: 60% (59658/99426)
Performing inexact rename detection: 61% (60651/99426)
Performing inexact rename detection: 62% (61647/99426)
Performing inexact rename detection: 63% (62640/99426)
Performing inexact rename detection: 64% (63633/99426)
Performing inexact rename detection: 65% (64629/99426)
Performing inexact rename detection: 66% (65622/99426)
Performing inexact rename detection: 67% (66618/99426)
Performing inexact rename detection: 67% (67314/99426)
Performing inexact rename detection: 68% (67611/99426)
Performing inexact rename detection: 69% (68604/99426)
Performing inexact rename detection: 70% (69600/99426)
Performing inexact rename detection: 71% (70593/99426)
Performing inexact rename detection: 72% (71589/99426)
Performing inexact rename detection: 73% (72582/99426)
Performing inexact rename detection: 74% (73578/99426)
Performing inexact rename detection: 75% (74571/99426)
Performing inexact rename detection: 76% (75564/99426)
Performing inexact rename detection: 77% (76560/99426)
Performing inexact rename detection: 78% (77553/99426)
Performing inexact rename detection: 79% (78549/99426)
Performing inexact rename detection: 80% (79542/99426)
Performing inexact rename detection: 81% (80538/99426)
Performing inexact rename detection: 82% (81531/99426)
Performing inexact rename detection: 82% (82395/99426)
Performing inexact rename detection: 83% (82524/99426)
Performing inexact rename detection: 84% (83520/99426)
Performing inexact rename detection: 85% (84513/99426)
Performing inexact rename detection: 86% (85509/99426)
Performing inexact rename detection: 87% (86502/99426)
Performing inexact rename detection: 88% (87495/99426)
Performing inexact rename detection: 89% (88491/99426)
Performing inexact rename detection: 90% (89484/99426)
Performing inexact rename detection: 91% (90480/99426)
Performing inexact rename detection: 92% (91473/99426)
Performing inexact rename detection: 93% (92469/99426)
Performing inexact rename detection: 94% (93462/99426)
Performing inexact rename detection: 95% (94455/99426)
Performing inexact rename detection: 96% (95451/99426)
Performing inexact rename detection: 97% (96444/99426)
Performing inexact rename detection: 98% (97440/99426)
Performing inexact rename detection: 99% (98433/99426)
Performing inexact rename detection: 100% (99426/99426)
Performing inexact rename detection: 100% (99426/99426), done.
error: could not apply e13e3a6b642f... Bug 1995636 - Increase navigation rate limiting threshold. r=smaug,zcorpan
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Hide error details
To manually resolve conflicts and submit your uplift:
git fetch origin
git switch -c uplift-firefox-esr115-D280599 origin/esr115
git cherry-pick e13e3a6b642fa3bd2c5b05f5dfbeac28d434a252
moz-phab uplift --train firefox-esr115 --assessment-id 1010
Run these commands from your Firefox checkout. Resolve any merge conflicts during the patch application process, then submit with moz-phab uplift.
Note: These commands assume your official Firefox remote is named origin. If you use a different remote name, adjust the commands accordingly.
Hide resolution steps