From eb104c72af2b13b9c1910ce06b52fe35cbb59eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 29 Oct 2021 17:29:36 +0200 Subject: [PATCH] doc: update maintaining ICU guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not ask to separate the changes in deps/icu-small and in the LICENSE file. Do not ask to remove the whitespace changes. The way commits are landed now doesn't eliminate them anymore. PR-URL: https://github.com/nodejs/node/pull/40658 Reviewed-By: Richard Lau Reviewed-By: Tobias Nießen --- doc/guides/maintaining-icu.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/doc/guides/maintaining-icu.md b/doc/guides/maintaining-icu.md index 56e5c58aa0f521..73801f60ffefc5 100644 --- a/doc/guides/maintaining-icu.md +++ b/doc/guides/maintaining-icu.md @@ -159,8 +159,7 @@ new Intl.DateTimeFormat('es', { month: 'long' }).format(new Date(9E8)); (This should print your updated ICU version number, and also `enero` again.) -You are ready to check in the updated `deps/icu-small`. This is a big commit, -so make this a separate commit from the smaller changes. +You are ready to check in (`git add`) the updated `deps/icu-small`. > :warning: Do not modify any source code in `deps/icu-small` ! > See section below about floating patches to ICU. @@ -185,13 +184,8 @@ make make test-ci ``` -* commit the change to `tools/icu/current_ver.dep` and `LICENSE` files. - - * To simplify review, I often will “pre-land” this patch, meaning that I run - `curl -L https://github.com/nodejs/node/pull/xxx.patch | git am -3 --whitespace=fix` - per the collaborator’s guide… and then push that patched branch into my - PR's branch. This reduces the whitespace changes that show up in the PR, - since the final land will eliminate those anyway. +* Commit the change to the `deps/icu-small`, `tools/icu/current_ver.dep` + and `LICENSE` files. ## Floating patches to ICU