139
edits
(moving external tools) |
(Adding mention of Elm.) |
||
| Line 39: | Line 39: | ||
=====Repositories===== | =====Repositories===== | ||
The merge changes are centrally stored on a Mercurial [https://hg.mozilla.org/users/na-g_nostrum.com/libwebrtc-merge-2H2020 user repository] hosted by Mozilla. This will allow the team to create a canonically ordered patch set to work off of day-to-day and it will eventually be landed with Lando on `autoland`. This repository is referred to as the `merge repo`. | The merge changes are centrally stored on a Mercurial [https://hg.mozilla.org/users/na-g_nostrum.com/libwebrtc-merge-2H2020 user repository] hosted by Mozilla. This will allow the team to create a canonically ordered patch set to work off of day-to-day and it will eventually be landed with Lando on `autoland`. This repository is referred to as the `merge repo`. | ||
Additionally there exists a fork of the WebRTC native library repository on Github at [https://github.com/mozilla/libwebrtc mozilla/libwebrtc]. As changes are made to libwebrtc within the merge, those changes will be gathered into a set of git commits to upstream. A second set of commits to retain but not upstream can also be maintained, but this set should be as close to empty as possible. During future libwebrtc merges the Github repository will be updated from the upstream google repository and our retained patches will be rebased on top of the new head. | Additionally there exists a fork of the WebRTC native library repository on Github at [https://github.com/mozilla/libwebrtc mozilla/libwebrtc]. As changes are made to libwebrtc within the merge, those changes will be gathered into a set of git commits to upstream. A second set of commits to retain but not upstream can also be maintained, but this set should be as close to empty as possible. During future libwebrtc merges the Github repository will be updated from the upstream google repository and our retained patches will be rebased on top of the new head. | ||
As of Sept. 3rd, we are moving from the user repository to a [[ReleaseEngineering/DisposableProjectRepositories|DisposableProjectRepositories]] named `Elm`. This is a repo for long running projects, and it can be referenced by a number of Mozilla's infrastructure facilities. | |||
=====Process Flow===== | =====Process Flow===== | ||
Developers will work on top of the merge repository. Those changes will be pushed to Phabricator for review. Once approved, a change set is push on top of the current tip of the merge repository, and the revision is closed in Phabricator. If further changes need to be made to the contents of the revision, those should be done in a new change set. | Developers will work on top of the merge repository. Those changes will be pushed to Phabricator for review. Once approved, a change set is push on top of the current tip of the merge repository, and the revision is closed in Phabricator. If further changes need to be made to the contents of the revision, those should be done in a new change set. | ||
edits