----- Original Message ----- > The patch should be correctly formatted, but I attached it anyway to > be sure for this time.
Actually, it failed when I tried the apply the full mail: $ git am -3 ~/tmp/patch.txt Applying: wglSetPixelFormat should ignore the ppfd parameter Using index info to reconstruct a base tree... error: patch failed: src/gallium/state_trackers/wgl/stw_wgl.c:172 error: src/gallium/state_trackers/wgl/stw_wgl.c: patch does not apply error: patch failed: src/mesa/drivers/windows/gdi/wgl.c:335 error: src/mesa/drivers/windows/gdi/wgl.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 wglSetPixelFormat should ignore the ppfd parameter When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". but it was happy with the attachement: $ git am --abort $ git reset --hard HEAD $ git am -3 ~/downloads/0002-wglSetPixelFormat-should-ignore-the-ppfd-parameter.patch Applying: wglSetPixelFormat should ignore the ppfd parameter. $ It could be my fault.. Anyway, it's pushed now. Thanks. Jose _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
