Skip to content

Instantly share code, notes, and snippets.

@tobie
Last active August 29, 2015 14:00
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save tobie/11063856 to your computer and use it in GitHub Desktop.
Save tobie/11063856 to your computer and use it in GitHub Desktop.
qpush sw queue
Tobie-Langels-MacBook-Air:mozilla-central tobielangel$ hg tip
changeset: 179233:45ba19361b97
tag: tip
parent: 179197:bf19c003ffc3
parent: 179232:93d3946fd9e0
user: Ryan VanderMeulen <ryanvm@gmail.com>
date: Fri Apr 18 09:08:59 2014 -0400
summary: Merge inbound to m-c.
Tobie-Langels-MacBook-Air:mozilla-central tobielangel$ hg qpush 903441-sw-nointercept
applying 857464-push-prefs
patching file b2g/app/b2g.js
Hunk #1 succeeded at 424 with fuzz 2 (offset 4 lines).
applying 857464-push-webpages
applying 885093-push-prompt
applying 898524-1-nowhite
applying 898524-2-nowhite
applying 898524-sw-docload
applying 903441-intercepts
patching file docshell/base/nsDocShell.cpp
Hunk #1 FAILED at 10077
Hunk #2 FAILED at 10098
2 out of 2 hunks FAILED -- saving rejects to file docshell/base/nsDocShell.cpp.rej
unable to find 'dom/interfaces/base/nsIServiceWorkerManager.idl' for patching
1 out of 1 hunks FAILED -- saving rejects to file dom/interfaces/base/nsIServiceWorkerManager.idl.rej
patching file dom/workers/ScriptLoader.cpp
Hunk #1 succeeded at 125 with fuzz 2 (offset -11 lines).
unable to find 'dom/workers/ServiceWorkerManager.cpp' for patching
2 out of 2 hunks FAILED -- saving rejects to file dom/workers/ServiceWorkerManager.cpp.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh 903441-intercepts
857464-push-prefs
857464-push-webpages
885093-push-prompt
898524-1-nowhite
898524-2-nowhite
898524-sw-docload
903441-intercepts
903441-navigation-event
903441-setup-request
903441-stuff
903441-sw-nointercept
916373-eventfixes
930348-sw-stubs
931249-caching1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment