Confirmed users
600
edits
Sheriffing/How To/Unified Repos: Difference between revisions
Jump to navigation
Jump to search
add internal merge tool setup and xcode install as requirements for macOS
(drop references to mozilla-inbound repository) |
(add internal merge tool setup and xcode install as requirements for macOS) |
||
| Line 8: | Line 8: | ||
* Install [https://www.mercurial-scm.org/downloads Mercurial 4.2] or higher | * Install [https://www.mercurial-scm.org/downloads Mercurial 4.2] or higher | ||
* Make a copy of your .hgrc file for safekeeping and delete the original | * Make a copy of your .hgrc file for safekeeping and delete the original | ||
* Use default hg tool to resolve code conflicts: | |||
** Open .hgrc file in home folder. | |||
** Search for line <code>[ui]</code>. | |||
** Search for line starting with <code>merge =</code> between the line above and the next one starting with <code>[</code>. | |||
** Add or update it to match <code>merge = internal:merge3</code> | |||
* hg clone https://hg.mozilla.org/mozilla-central | * hg clone https://hg.mozilla.org/mozilla-central | ||
* cd mozilla-central | * cd mozilla-central | ||
* ./mach mercurial-setup | * ./mach mercurial-setup | ||
* On macOS | |||
** Install xcode which is be required for the execution of some commands: <code>xcode-select --install</code><br>This will open an install dialog which might be minimized. Check the list of open applications and confirm the installation. | |||
Configure mercurial as desired. At a minimum, you need the following: | Configure mercurial as desired. At a minimum, you need the following: | ||