doc: update maintaining ICU guide

targos · targos · commit 9271f23e3a3b · 2021-11-21T16:07:32.000+01:00
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: #40658 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git 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 &ldquo;pre-land&rdquo; this patch, meaning that I run
-    `curl -L https://github.com/nodejs/node/pull/xxx.patch | git am -3 --whitespace=fix`
-    per the collaborator&rsquo;s guide&hellip;&nbsp;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
 
