| commit | faaacb655ea179ebf3afa7d74e4a13d998991d7e | [log] [tgz] |
|---|---|---|
| author | Jon Murphy <jpmurphy@google.com> | Wed Aug 07 14:44:08 2024 -0600 |
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Aug 16 03:29:02 2024 +0000 |
| tree | 34935607247c99208b86fe4fcd34974c8db71fdd | |
| parent | a1f9530f59e2d933cd32e3b171fbcaeec89ca910 [diff] |
copybot: Add support for uploading conflicts Add support for uploading conflicted CLs through the merge behavior ALLOW_CONFLICT. Should conflicts be committed, the script will exit with an error to notify the downstreamers that they need to go review the conflicted CL. BUG=None TEST=./copybot.py --topic android-downstream --label Verified+1 --re nvaccaro@google.com --re subratabanik@google.com --merge-conflict-behavior ALLOW_CONFLICT --keep-pseudoheader Cq-Depend --keep-pseudoheader Change-Id --push-option 'uploadvalidator~skip' --push-option nokeycheck --ht '' --ht '' --upstream-history-limit 5 --downstream-history-limit 1000 --add-pseudoheader 'Cr-Build-Id: 8740269368728257329' --add-pseudoheader 'Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8740269368728257329' --add-pseudoheader 'Copybot-Job-Name: android-brya-vboot_reference-copybot-downstream' --dry-run https://chromium.googlesource.com/chromiumos/platform/vboot_reference:firmware-android-15949.B https://chromium.googlesource.com/chromiumos/platform/vboot_reference:firmware-android-brya-14505.782.B: Change-Id: I1e4b7f18c61f478cfdbd613bb73ef40254aaa79a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/5771074 Commit-Queue: Jonathon Murphy <jpmurphy@google.com> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Tested-by: Jonathon Murphy <jpmurphy@google.com> Auto-Submit: Jonathon Murphy <jpmurphy@google.com>