CQ can't apply patch but bots can |
||||||
Issue descriptionI sent a change out for trybots 16 hours ago: https://codereview.chromium.org/2768933004/#ps20001 It applied fine, even with retries that just succeeded now. However after it got ready to commit, the CQ said it couldn't apply the patch. The conflict was from a patch that landed 27 hours ago (https://codereview.chromium.org/2735183003), so I'm surprised that the CQ has different patching logic?
,
Mar 27 2017
I'm 99% sure this is because we disabled 3-way merge in CQ, but not on bots. See also issue 678172 . I think we can re-enable 3-way merge now: https://chrome-internal-review.googlesource.com/c/340044
,
Mar 27 2017
,
Mar 27 2017
The following revision refers to this bug: https://chrome-internal.googlesource.com/infra/infra_internal/+/af9b202bd2a4c57742dd374030e02404f93002cd commit af9b202bd2a4c57742dd374030e02404f93002cd Author: Andrii Shyshkalov <tandrii@chromium.org> Date: Mon Mar 27 17:40:03 2017
,
Mar 27 2017
,
Apr 4 2017
Thanks!
,
Apr 13 2017
Issue 678172 has been merged into this issue. |
||||||
►
Sign in to add a comment |
||||||
Comment 1 by jam@chromium.org
, Mar 24 2017