[Mesa-dev] [PATCH 0/2] scons 2.5.0 support

Giuseppe Bilotta giuseppe.bilotta at gmail.com
Wed May 25 05:49:50 UTC 2016

> Sure.  Unfortunately, the series does not apply cleanly on ToT master:
> % git am p[12].txt
> Applying: scons: whitespace cleanup
> Using index info to reconstruct a base tree...
> error: patch failed: src/gallium/state_trackers/wgl/SConscript:12
> error: src/gallium/state_trackers/wgl/SConscript: 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 scons: whitespace cleanup
> The copy of the patch that failed is found in:
>    /home/brianp/mesa/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".

That's very odd. I'm on master from anongit.freedesktop.org/mesa/mesa
and I had no issues rebasing.

> Can you update the patches and send them to me?  Thanks.

Sure. I'll take the opportunity to add the lines suggested by Emil and
also document the shell command used to generate the first patch.

Best regards,

Giuseppe "Oblomov" Bilotta

More information about the mesa-dev mailing list