This page is for integrators who will be bringing in code or changes to code from an external repository. This page describes the process where the code will be integrated into the ACME repository as a git subtree.
Step-by-step guide (or consult the flowchart)
- Create a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. If the external code is to be completely replaced, create the branch from the commit where the code was last brought into the ACME repository (similar for the procedure for fixing a bug). The branch name should follow the form github-username/component/component.<version>_import.
- If the external code is new (no version is currently in ACME repository), skip to step x.
- If the external code is to be completely replaced, remove the code from your working copy (see below). Then, skip to step z.
- Check to see if the version of the code in the ACME repository has been modified since the initial commit (see below). If there are no changes (blank output), skip to step y.
| Anchor |
|---|
| RemoveOriginal |
|---|
| RemoveOriginal |
|---|
|
Removing original external code (external code initially installed with ACME v0.0)
cd <code-subdir>/..
git rm -r .
git commit -a
| Anchor |
|---|
| #Check4CodeMods |
|---|
| #Check4CodeMods |
|---|
|
Checking for code modification (external code initially installed with ACME v0.0) cd <code-subdir>
git diff --name-only v0.0 .
...