(In reply to Mike Conley (:mconley) (:⚙️) from comment #6) > The best bet might be to back out bug 1534389 (https://hg.mozilla.org/mozilla-central/rev/0930049c0ca9) from beta, to buy me more time to fix this in 69. > > apavel, is backing out 0930049c0ca9 on beta something you could help me with? Hi, sure. I got mozilla@ubuntu ~/mozilla-unified beta(0) $ hg oops -er 0930049c0ca9 checking for uncommitted changes backing out 0930049c0ca9 applying patch from stdin patching file widget/windows/nsWindow.cpp Hunk #2 FAILED at 613 Hunk #3 FAILED at 5309 Hunk #4 FAILED at 5343 Hunk #6 FAILED at 6170 4 out of 6 hunks FAILED -- saving rejects to file widget/windows/nsWindow.cpp.rej patching file widget/windows/nsWindow.h Hunk #3 FAILED at 661 1 out of 4 hunks FAILED -- saving rejects to file widget/windows/nsWindow.h.rej To fix this all I need to do is revert the changes here https://hg.mozilla.org/mozilla-central/rev/0930049c0ca9 right?
Bug 1551961 Comment 7 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
(In reply to Mike Conley (:mconley) (:⚙️) from comment #6) > The best bet might be to back out bug 1534389 (https://hg.mozilla.org/mozilla-central/rev/0930049c0ca9) from beta, to buy me more time to fix this in 69. > > apavel, is backing out 0930049c0ca9 on beta something you could help me with? Hi, sure. I got mozilla@ubuntu ~/mozilla-unified beta(0) $ hg oops -er 0930049c0ca9 checking for uncommitted changes backing out 0930049c0ca9 applying patch from stdin patching file widget/windows/nsWindow.cpp Hunk #2 FAILED at 613 Hunk #3 FAILED at 5309 Hunk #4 FAILED at 5343 Hunk #6 FAILED at 6170 4 out of 6 hunks FAILED -- saving rejects to file widget/windows/nsWindow.cpp.rej patching file widget/windows/nsWindow.h Hunk #3 FAILED at 661 1 out of 4 hunks FAILED -- saving rejects to file widget/windows/nsWindow.h.rej To fix this all I need to do is revert the changes here https://hg.mozilla.org/mozilla-central/rev/0930049c0ca9 right? .rej file looks like this https://pad.mozilla.org/p/changes