Bug 1493599 Comment 51 Edit History

Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.

Original comment by
on 
@mayhemer: Thanks for the update, but I am seeing conflicts when applying the patch on the latest m-c

Can you please rebase?

Honza

patching file devtools/server/actors/network-monitor/network-observer.js
Hunk #1 FAILED at 131
Hunk #2 FAILED at 206
Hunk #4 FAILED at 1151
3 out of 4 hunks FAILED -- saving rejects to file devtools/server/actors/network-monitor/network-observer.js.rej
patching file dom/security/nsMixedContentBlocker.cpp
Hunk #1 FAILED at 360
1 out of 2 hunks FAILED -- saving rejects to file dom/security/nsMixedContentBlocker.cpp.rej
patching file ipc/glue/BackgroundUtils.cpp
Hunk #1 FAILED at 533
Hunk #2 FAILED at 684
Hunk #3 FAILED at 702
Hunk #4 FAILED at 730
Hunk #5 FAILED at 762
5 out of 5 hunks FAILED -- saving rejects to file ipc/glue/BackgroundUtils.cpp.rej
patching file netwerk/base/LoadInfo.h
Hunk #1 FAILED at 124
Hunk #2 FAILED at 197
2 out of 2 hunks FAILED -- saving rejects to file netwerk/base/LoadInfo.h.rej
patching file netwerk/base/LoadInfo.cpp
Hunk #1 FAILED at 89
Hunk #2 FAILED at 354
Hunk #3 FAILED at 465
Hunk #4 FAILED at 506
Hunk #5 FAILED at 548
5 out of 6 hunks FAILED -- saving rejects to file netwerk/base/LoadInfo.cpp.rej
patching file netwerk/base/nsILoadInfo.idl
Hunk #3 succeeded at 1111 with fuzz 1 (offset 40 lines).
patching file netwerk/base/nsNetUtil.h
Hunk #1 succeeded at 949 with fuzz 2 (offset 3 lines).
patching file netwerk/base/nsNetUtil.cpp
Hunk #1 succeeded at 3014 with fuzz 1 (offset 7 lines).
patching file netwerk/ipc/NeckoChannelParams.ipdlh
Hunk #1 FAILED at 139
Hunk #2 succeeded at 183 with fuzz 2 (offset 6 lines).
1 out of 2 hunks FAILED -- saving rejects to file netwerk/ipc/NeckoChannelParams.ipdlh.rej
patching file netwerk/protocol/http/HttpChannelChild.h
Hunk #1 FAILED at 214
1 out of 1 hunks FAILED -- saving rejects to file netwerk/protocol/http/HttpChannelChild.h.rej
patching file netwerk/protocol/http/HttpChannelChild.cpp
Hunk #1 FAILED at 2410
Hunk #3 FAILED at 2477
2 out of 3 hunks FAILED -- saving rejects to file netwerk/protocol/http/HttpChannelChild.cpp.rej
patching file netwerk/protocol/http/nsCORSListenerProxy.cpp
Hunk #1 FAILED at 55
Hunk #2 FAILED at 509
Hunk #3 FAILED at 517
Hunk #4 FAILED at 532
Hunk #5 FAILED at 551
Hunk #6 FAILED at 573
Hunk #7 FAILED at 583
Hunk #8 FAILED at 598
Hunk #9 FAILED at 936
Hunk #10 FAILED at 1006
Hunk #11 FAILED at 1046
Hunk #12 FAILED at 1259
Hunk #13 FAILED at 1285
Hunk #14 FAILED at 1305
Hunk #15 FAILED at 1329
Hunk #16 FAILED at 1337
Hunk #17 FAILED at 1374
17 out of 17 hunks FAILED -- saving rejects to file netwerk/protocol/http/nsCORSListenerProxy.cpp.rej
patching file netwerk/protocol/http/nsHttpHandler.h
Hunk #1 succeeded at 331 with fuzz 1 (offset 5 lines).
patching file netwerk/protocol/http/nsIHttpProtocolHandler.idl
Hunk #1 FAILED at 89
1 out of 1 hunks FAILED -- saving rejects to file netwerk/protocol/http/nsIHttpProtocolHandler.idl.rej
patching file netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp
Hunk #1 succeeded at 160 with fuzz 2 (offset 0 lines).
patching file netwerk/url-classifier/nsChannelClassifier.cpp
Hunk #1 succeeded at 459 with fuzz 1 (offset 29 lines).
patching file xpcom/ds/nsObserverService.cpp
Hunk #1 FAILED at 185
1 out of 1 hunks FAILED -- saving rejects to file xpcom/ds/nsObserverService.cpp.rej
patch failed, unable to continue (try -v)
Processing 15 file(s)...
patch failed, rejects left in working directory

Back to Bug 1493599 Comment 51