This can happen if landing the update took a long time such that there is
a local patch against a file that was changed upstream in the period between
starting the update and landing it.
This can happen if landing the update took a long time such that there is
a local patch against a file that was changed upstream in the period between
starting the update and landing it.
This extends the upstream update script with steps for pushing
local changes to upstream. The general approach is to look for all
commits to the tests directory since the last sync, rewrite those
so they apply to upstream at the last sync point, then rebase onto
the sync commit, before creating and merging a PR for each in turn.
--HG--
rename : testing/web-platform/fetchlogs.py => testing/web-platform/update/fetchlogs.py