This repository contains a mix of upstream history and fuchsia-specific changes.

Updating upstream sources is generally done as follows, where $OLD is the current version and $NEW is the version you wish to upgrade to:

git fetch --all
git diff "$OLD" -- $(git diff "$OLD".."$NEW" --name-only) > fuchsia.patch
git merge "$NEW"

resolve merge conflicts

git apply --reject --whitespace=fix fuchsia.patch

resolve failed chunks

rm '*.rej'
rm fuchsia.patch

commit and upload a CL as usual

use Run-All-Tests: True - our affected tests tooling doesn't work here