160
edits
TestEngineering/Performance/Sheriffing/Tree FAQ: Difference between revisions
TestEngineering/Performance/Sheriffing/Tree FAQ (view source)
Revision as of 13:03, 16 January 2018
, 16 January 2018update paragraph
(update paragraph) |
(update paragraph) |
||
| Line 36: | Line 36: | ||
= What is a merge = | = What is a merge = | ||
Many times each day we merge code from the integration branches into the main branch and back. This is a common process in large projects. At Mozilla, this means that the majority of the code for Firefox is checked into Mozilla-Inbound and | Many times each day we merge code from the integration branches into the main branch and back. This is a common process in large projects. At Mozilla, this means that the majority of the code for Firefox is checked into Mozilla-Inbound and Autoland, then it is merged into Mozilla-Central (also referred to as Firefox) and then once merged, it gets merged back into the other branches. If you want to read more about this process, here are [https://wiki.mozilla.org/Sheriffing/How_To/Merges the details]. | ||
Here is an example of a view of what a merge looks like on [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=126a1ec5c7c5 TreeHerder]: | Here is an example of a view of what a merge looks like on [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound&revision=126a1ec5c7c5 TreeHerder]: | ||
| Line 44: | Line 44: | ||
Note that the topmost revision has the commit messsage of: "merge m-c to m-i". This is pretty standard and you can see that there are a series of [https://hg.mozilla.org/integration/mozilla-inbound/pushloghtml?changeset=126a1ec5c7c5 changesets], not just a few related patches. | Note that the topmost revision has the commit messsage of: "merge m-c to m-i". This is pretty standard and you can see that there are a series of [https://hg.mozilla.org/integration/mozilla-inbound/pushloghtml?changeset=126a1ec5c7c5 changesets], not just a few related patches. | ||
How this affects alerts is that when a regression lands on Mozilla-Inbound, it will be merged into Firefox, then | How this affects alerts is that when a regression lands on Mozilla-Inbound, it will be merged into Firefox, then Autoland. Most likely this means that you will see duplicate alerts on the other integration branch. | ||
* note: we do not generate alerts for the Firefox (Mozilla-Central) branch. | * note: we do not generate alerts for the Firefox (Mozilla-Central) branch. | ||