Skip to content

Commit

Permalink
doc: update maintaining ICU guide
Browse files Browse the repository at this point in the history
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
Backport-PR-URL: #41525
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
  • Loading branch information
targos committed Jan 18, 2022
1 parent 5aa45ae commit ab28dc5
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions doc/guides/maintaining-icu.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down

0 comments on commit ab28dc5

Please sign in to comment.