diff options
| author | Jordan R Abrahams <ajordanr@google.com> | 2022-01-13 21:48:15 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-01-14 21:23:35 +0000 |
| commit | 8337ced7d44c9d0d37ef87bbfb77913ed4f19c88 (patch) | |
| tree | 66d55382d0251022bcee3882b242e803096d7fa5 /rust_tools | |
| parent | 86739250cf453a73ff88b064c51a09b99c93b99f (diff) | |
| download | toolchain-utils-8337ced7d44c9d0d37ef87bbfb77913ed4f19c88.tar.gz | |
patch_sync: Rework show cmd to display merged
At present, patch_sync show merges two PATCHES.json files by
merging their platform contents. However, because of timing,
review latency, or just patches being denied, it's possible that
one repo recommends a patch being applied to a certain platform,
and the other denies that same patch.
To resolve this conflict, this commit by default only considers
patches that exist in the PATCHES.json file at the present time.
The original behaviour can be enabled by turning on --keep-unmerged.
BUG=b:209493133
TEST=patch_sync show <...cros> <...android>
TEST=patch_sync transpose --dry-run -s <...>
Change-Id: I3bdf6c36b4dbfe26d4221191b5c22363a7f0dfe0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3388390
Reviewed-by: George Burgess <gbiv@chromium.org>
Tested-by: Jordan Abrahams-Whitehead <ajordanr@google.com>
Commit-Queue: Jordan Abrahams-Whitehead <ajordanr@google.com>
Diffstat (limited to 'rust_tools')
0 files changed, 0 insertions, 0 deletions