It seems that I'm having some trouble locally applying some of the patches: ```console $ moz-phab patch D304798 Nothing changed.ment.. | Patching revisions: D304789 D304790 D304791 D304792 D304793 D304794 D304795 D304796 D304798 Unknown revision: 0636c092d583 Cinnabar extension not enabled. Use --apply-to to set the base commit. $ moz-phab patch --apply-to here D304798 Nothing changed.ment.. | Patching revisions: D304789 D304790 D304791 D304792 D304793 D304794 D304795 D304796 D304798 Warning: Target revision is empty. Created bookmark phab-D304798 D304789 applied D304790 applied D304791 applied D304792 applied D304793 applied D304794 applied D304795 applied D304796 applied error: patch failed: js/src/jit/riscv64/MacroAssembler-riscv64.h:739 error: js/src/jit/riscv64/MacroAssembler-riscv64.h: patch does not apply ``` My HEAD is at cf8510b7c3bb11cf4abc2f8aa431eebdcb38b41b: ``` Commit ID: cf8510b7c3bb11cf4abc2f8aa431eebdcb38b41b Change ID: mrxmynmwomssrnxuuykvwmuxkwrrmmnw Bookmarks: main@origin Author : Mark Kennedy <mkennedy@mozilla.com> (2026-06-05 07:24:55) Committer: mkennedy@mozilla.com <mkennedy@mozilla.com> (2026-06-05 07:27:09) Bug 2040444 - Fix back button trapping subcategory navigation on about:preferences r=tgiles ```
Bug 2045021 Comment 10 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
It seems that I'm having some trouble locally applying some of the patches: ```console $ moz-phab patch D304798 Nothing changed.ment.. | Patching revisions: D304789 D304790 D304791 D304792 D304793 D304794 D304795 D304796 D304798 Unknown revision: 0636c092d583 Cinnabar extension not enabled. Use --apply-to to set the base commit. $ moz-phab patch --apply-to here D304798 Nothing changed.ment.. | Patching revisions: D304789 D304790 D304791 D304792 D304793 D304794 D304795 D304796 D304798 Warning: Target revision is empty. Created bookmark phab-D304798 D304789 applied D304790 applied D304791 applied D304792 applied D304793 applied D304794 applied D304795 applied D304796 applied error: patch failed: js/src/jit/riscv64/MacroAssembler-riscv64.h:739 error: js/src/jit/riscv64/MacroAssembler-riscv64.h: patch does not apply ``` My HEAD is at cf8510b7c3bb11cf4abc2f8aa431eebdcb38b41b: ``` Commit ID: cf8510b7c3bb11cf4abc2f8aa431eebdcb38b41b Change ID: mrxmynmwomssrnxuuykvwmuxkwrrmmnw Bookmarks: main@origin Author : Mark Kennedy <mkennedy@mozilla.com> (2026-06-05 07:24:55) Committer: mkennedy@mozilla.com <mkennedy@mozilla.com> (2026-06-05 07:27:09) Bug 2040444 - Fix back button trapping subcategory navigation on about:preferences r=tgiles ``` ------ Seems to be conflicting with <https://phabricator.services.mozilla.com/D304002>: ```console $ git apply --reject ./D304798.1780731164.diff Checking patch js/src/jit/riscv64/MacroAssembler-riscv64-inl.h... Hunk #1 succeeded at 1411 (offset -36 lines). Hunk #2 succeeded at 1430 (offset -36 lines). Checking patch js/src/jit/riscv64/MacroAssembler-riscv64.h... Hunk #1 succeeded at 334 (offset 10 lines). error: while searching for: void splitTagForTest(const ValueOperand& value, ScratchTagScope& tag) { splitTag(value, tag); } void moveIfZero(Register dst, Register src, Register cond) { Label done; ma_b(cond, cond, &done, NonZero, ShortJump); mv(dst, src); bind(&done); } void moveIfNotZero(Register dst, Register src, Register cond) { Label done; ma_b(cond, cond, &done, Zero, ShortJump); mv(dst, src); bind(&done); } error: patch failed: js/src/jit/riscv64/MacroAssembler-riscv64.h:739 Checking patch js/src/jit/riscv64/MacroAssembler-riscv64.cpp... Hunk #1 succeeded at 368 (offset 8 lines). Hunk #2 succeeded at 654 (offset 8 lines). Hunk #3 succeeded at 727 (offset 8 lines). Applied patch js/src/jit/riscv64/MacroAssembler-riscv64-inl.h cleanly. Applying patch js/src/jit/riscv64/MacroAssembler-riscv64.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applied patch js/src/jit/riscv64/MacroAssembler-riscv64.cpp cleanly. ```