Created
December 5, 2013 00:26
-
-
Save djg/7798142 to your computer and use it in GitHub Desktop.
Sad Panda.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| djg in ~/Mozilla/hg/mozilla-central | |
| $ export HGMERGE=p4merge | |
| djg in ~/Mozilla/hg/mozilla-central | |
| $ mhg qpush | |
| applying bug-942506-refactor-ApplyFilterToBoundTexture | |
| patching file gfx/gl/GLContext.cpp | |
| Hunk #1 FAILED at 1325 | |
| 1 out of 1 hunks FAILED -- saving rejects to file gfx/gl/GLContext.cpp.rej | |
| patching file gfx/gl/GLContextProviderGLX.cpp | |
| Hunk #10 FAILED at 1074 | |
| Hunk #11 FAILED at 1139 | |
| 2 out of 12 hunks FAILED -- saving rejects to file gfx/gl/GLContextProviderGLX.cpp.rej | |
| patching file gfx/gl/TextureImageEGL.cpp | |
| Hunk #1 FAILED at 303 | |
| 1 out of 1 hunks FAILED -- saving rejects to file gfx/gl/TextureImageEGL.cpp.rej | |
| patching file gfx/gl/TextureImageEGL.h | |
| Hunk #1 FAILED at 69 | |
| 1 out of 1 hunks FAILED -- saving rejects to file gfx/gl/TextureImageEGL.h.rej | |
| patch failed, unable to continue (try -v) | |
| patch failed, rejects left in working dir | |
| errors during apply, please fix and refresh bug-942506-refactor-ApplyFilterToBoundTexture |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment