|
|
DescriptionReapply: Fix printing.gyp by joining two 'conditions' dicts together.
ErrorLog:
gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp
Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711
R=govind, thestig@chromium.org
BUG=630890
TEST=build/gyp_chromium --check passes
Committed: https://crrev.com/f7789f833aa26bc38fe4a74276b0a57c45ca3c65
Cr-Commit-Position: refs/heads/master@{#407502}
Patch Set 1 #
Messages
Total messages: 19 (12 generated)
Description was changed from ========== Fix again. R=govind, thestig@chromium.org BUG= ========== to ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 ==========
Description was changed from ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 ========== to ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 TEST=build/gyp_chromium --check passes ==========
Sorry about the build breakage. This reapplies the patch that was reverted in the bad merge.
The CQ bit was checked by skau@chromium.org
The CQ bit was unchecked by skau@chromium.org
The CQ bit was checked by skau@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
skau@chromium.org changed reviewers: + govind@chromium.org - govind@google.com
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: This issue passed the CQ dry run.
lgtm
The CQ bit was checked by skau@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Message was sent while issue was closed.
Description was changed from ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 TEST=build/gyp_chromium --check passes ========== to ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 TEST=build/gyp_chromium --check passes ==========
Message was sent while issue was closed.
Committed patchset #1 (id:1)
Message was sent while issue was closed.
On 2016/07/25 17:22:45, commit-bot: I haz the power wrote: > CQ is trying da patch. Follow status at > > https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or... LGTM
Message was sent while issue was closed.
Description was changed from ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 TEST=build/gyp_chromium --check passes ========== to ========== Reapply: Fix printing.gyp by joining two 'conditions' dicts together. ErrorLog: gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711 R=govind, thestig@chromium.org BUG=630890 TEST=build/gyp_chromium --check passes Committed: https://crrev.com/f7789f833aa26bc38fe4a74276b0a57c45ca3c65 Cr-Commit-Position: refs/heads/master@{#407502} ==========
Message was sent while issue was closed.
Patchset 1 (id:??) landed as https://crrev.com/f7789f833aa26bc38fe4a74276b0a57c45ca3c65 Cr-Commit-Position: refs/heads/master@{#407502} |