Landing requested on , by rob@robwu.nl.
Landing Job:
5774
Revisions:
D248537
diff 1045183
While applying revision D248537 to firefox-autoland, the following files had
conflicts:
(Hint: try rebasing your changes on the latest commits from firefox-autoland and re-submitting.)
-
browser/base/content/browser-init.js @ 12e8ffb3f0625ae0bc6f958132bfd01d92b105c5
diff a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js (rejected hunks)
@@ -271,10 +271,15 @@
...
diff a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js (rejected hunks)
@@ -271,10 +271,15 @@
let swapBrowsers = () => {
if (gBrowser.isTabGroupLabel(tabToAdopt)) {
gBrowser.adoptTabGroup(tabToAdopt.group, 0);
gBrowser.removeTab(gBrowser.selectedTab);
+ } else if (gBrowser.isTabGroup(tabToAdopt)) {
+ // Via gBrowser.replaceGroupWithWindow
+ gBrowser.adoptTabGroup(tabToAdopt, 0);
+ gBrowser.removeTab(gBrowser.selectedTab);
+ Glean.tabgroup.groupInteractions.move_window.add(1);
} else {
if (tabToAdopt.group) {
Glean.tabgroup.tabInteractions.remove_new_window.add();
}
gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, tabToAdopt);
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.