Am Freitag, 1. Juli 2016 21:52:27 UTC+2 schrieb Henrik Skupin: > I'm just curious when autoland will actually be merged to > mozilla-central the first time. Given that we have this repository for a > while now, and sheriffs merged mozilla-central into it a couple of > times, I do not see any single merge of autoland to mozilla-central yet. > It's blocking some of my patches to reach Nightly builds. So for me the > current situation is not satisfying. > > Can you please clarify the merge strategy? >
Hi Henrik you are totally wrong here. Short answer: we do merge autoland already since a few days. The thing that you "don't see" it has technically reasons. When m-c has not changed (like a direct backout on m-c) the first "merge" from a integration tree is not a hg merge its more a hg update (without the merge x to y) commit. This was always so and we did it also with b2g-inbound etc. The merge work is now the following 1.) update/merge autoland to m-c (as mentioned its not a hg merge commit in most cases) 2. the integration trees (mostly with fx-team and then inbound) follows *with* a hg merge and so commit. So yeah as short we do our work ;) - Tomcat _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
