[icu] Document the upstream merging process
Bug: 56358
Change-Id: Idccf21d2e08cccedb25bcdc86916a7e5d5cd5007
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/icu/+/409094
Reviewed-by: Filip Filmar <fmil@google.com>
Reviewed-by: Konstantin Pozin <kpozin@google.com>
diff --git a/README.fuchsia b/README.fuchsia
index bd3a223..0bcc319 100644
--- a/README.fuchsia
+++ b/README.fuchsia
@@ -37,13 +37,26 @@
To ensure that Fuchsia's ICU repo properly tracks Chromium's version, do the
following when catching up:
-1. Apply all patches of interest.
+1. Add the Chromium upstream remote (first-time only):
- See an example here:
- https://fuchsia-review.googlesource.com/c/third_party/icu/+/403454
+ Run the following command to add the upstream Chromium copy of the ICU
+ repository. This is only needed if you have not previously added the
+ Chromium remote:
+ $ git remote add chromium https://chromium.googlesource.com/chromium/deps/icu.git
-2. Ensure that the version number in `//version.gni` matches the major version
+2. Merge from Chromium ToT:
+
+ From $FUCHSIA_DIR/third_party/icu on the origin/master branch, run:
+ $ git merge chromium/master
+
+ Fix all the merge conflicts, paying special attention to not override
+ Fuchsia-specific changes. In particular, make sure the Mac host build does
+ not break as this configuration is not tested in CQ. If you do not have a
+ Mac, ask someone who does to test your changes before submitting.
+
+ Ensure that the version number in `//version.gni` matches the major version
of the ICU library that is being used. The file `//README.chromium` usually
has the major version number listed in the `Description:` section.
-
+ See an example here:
+ https://fuchsia-review.googlesource.com/c/third_party/icu/+/403454
