- browser/base/content/browser-init.js @ 12e8ffb3f0625ae0bc6f958132bfd01d92b105c5
Error parsing error for browser/base/content/browser-init.js. This is likely due to a conflict when removing a file, see bug 1968636. See Raw error output below.
Landing requested on , by rob@robwu.nl.
Landing Job: 6151
Revisions: D248537 diff 1049445
Last update:
Result: 6f6f519103241a75b9e08813ba7a904b4ff918ba on firefox-autoland@autoland (git)
Links: Treeherder
Landing requested on , by rob@robwu.nl.
Landing Job: 5774
Revisions: D248537 diff 1045183
While applying revision D248537 to !unknown tree!, the following files had conflicts:
(Hint: try rebasing your changes on the latest commits from !unknown tree! and re-submitting.)
Error parsing error for browser/base/content/browser-init.js. This is likely due to a conflict when removing a file, see bug 1968636. See Raw error output below.
Last update:
Raw error output: Problem while applying patch in revision 248537: Checking patch browser/components/tabbrowser/content/tabbrowser.js... Hunk #1 succeeded at 5757 (offset 30 lines). Hunk #2 succeeded at 5778 (offset 30 lines). Hunk #3 succeeded at 5873 (offset 30 lines). Checking patch browser/components/extensions/test/browser/browser_ext_tabGroups_move_onMoved.js... Hunk #1 succeeded at 203 (offset -4 lines). Hunk #2 succeeded at 222 (offset -4 lines). Checking patch browser/components/extensions/parent/ext-browser.js... Checking patch browser/base/content/browser-init.js... error: while searching for: let swapBrowsers = () => { if (gBrowser.isTabGroupLabel(tabToAdopt)) { gBrowser.adoptTabGroup(tabToAdopt.group, 0); gBrowser.removeTab(gBrowser.selectedTab); } else { if (tabToAdopt.group) { Glean.tabgroup.tabInteractions.remove_new_window.add(); } gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, tabToAdopt); error: patch failed: browser/base/content/browser-init.js:271 Applied patch browser/components/tabbrowser/content/tabbrowser.js cleanly. Applied patch browser/components/extensions/test/browser/browser_ext_tabGroups_move_onMoved.js cleanly. Applied patch browser/components/extensions/parent/ext-browser.js cleanly. Applying patch browser/base/content/browser-init.js with 1 reject... Rejected hunk #1.
Landing requested on , by rob@robwu.nl.
Landing Job: 4936
Revisions: D248537 diff 1030116
Last update:
Result: fac3f86e95e69ae1651ce1012aa28edcf80bc83d on firefox-autoland@autoland (git)
Links: Treeherder
Land | Bug | Status | Revision | Reviewers | |
---|---|---|---|---|---|
|
1965343 |
Blocked
Revision is closed.
Closed
|
D248537: Bug 1965343 - Adopt whole tab group at once in replaceGroupWithWindow
|
|
Request submitted
Your request for review by the sec-approval team has been submitted.