Comment 8 for bug 209025

I wonder if looms would be usable here - ie having an upstream branch and a local thread with your configuration that gets "rebased" every time you pull in a new upstream.