160
edits
TestEngineering/Performance/Sheriffing/Tree FAQ: Difference between revisions
Jump to navigation
Jump to search
TestEngineering/Performance/Sheriffing/Tree FAQ (view source)
Revision as of 12:45, 16 January 2018
, 16 January 2018remove extra brackets
(remove extra brackets) |
(remove extra brackets) |
||
| Line 39: | Line 39: | ||
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 Fx-Team, then it is merged into Mozilla-Central (also referred to as Firefox) and then once merged, it gets merged back into the other branches. | 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 Fx-Team, then it is merged into Mozilla-Central (also referred to as Firefox) and then once merged, it gets merged back into the other branches. | ||
Here is an example of a view of what a merge looks like on | 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]: | ||
[[File:Merge.png]] | [[File:Merge.png]] | ||
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 | 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 fx-team. Most likely this means that you will see duplicate alerts on the other integration branch. | How this affects alerts is that when a regression lands on Mozilla-Inbound, it will be merged into Firefox, then fx-team. Most likely this means that you will see duplicate alerts on the other integration branch. | ||