4 commits

Author	SHA1	Message	Date
Michael Goderbauer	f2370c4fa0	Switch engine.merge_method back to squash (#24319) ... Unfortunately, device lab does not have the capacity for merge method rebase. It's essentially DoSing device lab: The last engine rebase has been processing for 6h now and it is still not done :(	2018-11-13 17:12:36 -08:00
liyuqian	b21fe0aaad	Revert "Change engine merge method back to squash" (#24114) ... Reverts flutter/flutter#24111 as https://skia-review.googlesource.com/c/buildbot/+/167200 has been deployed.	2018-11-08 09:12:06 -08:00
liyuqian	c0fc864a60	Change engine merge method back to squash (#24111) ... We need to wait the fix in https://skia-review.googlesource.com/c/buildbot/+/169724 to land in order to enable the rebase merge method again. TBR: goderbauer We'll land this quickly without waiting for presubmit checks to unblock our engine roller.	2018-11-08 08:43:15 -08:00
liyuqian	57c2fac14a	Add engine merge method configuration (#23953) ... In order for this to take effect, https://skia-review.googlesource.com/c/buildbot/+/167200 needs to be landed and deployed. The /bin/internal/engine.merge_method file controls how we merge a pull request created by the engine auto-roller. If it's squash, there's only one commit for a pull request no matter how many engine commits there are inside that pull request. If it's rebase, the number of commits in the framework is equal to the number of engine commits in the pull request. The latter method is easier to detect regressions but cost more test resources.	2018-11-07 13:06:38 -08:00