Skip to content

Commit 86c570d

Browse files
committed
Revert ADR changes
1 parent adce7d7 commit 86c570d

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

adr/01-principles.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ At the point of time of writing of this ADR, these tools aim to assist
3232
developers in the following tasks:
3333

3434
* Creating new branches
35-
* Tracking dependency branches
35+
* Tracking upstream branches
3636
* Keeping downstream branches updated
37-
* Checking if a branch is updated with its dependencies
37+
* Checking if a branch is updated with its upstreams
3838
* Keeping branches isolated
39-
* Recreating a branch if an dependency needs to be removed
40-
* Recreating a branch from its dependency branches
41-
* Identifying conflicting dependency branches when adding a new dependency
39+
* Recreating a branch if an upstream needs to be removed
40+
* Recreating a branch from its upstream branches
41+
* Identifying conflicting upstream branches when adding a new upstream
4242
* Visualize dependencies of branches
4343
* Clean up a repository
4444

@@ -61,9 +61,9 @@ Tools should be written with the following in mind:
6161
within Docker.
6262
- Most configuration should be local to a repository. (Remote aliases can change
6363
per clone, aliases should not be installed globally, etc.) The current
64-
exception is the "dependency" branch configuration, which is stored within the
64+
exception is the "upstream" branch configuration, which is stored within the
6565
repository itself.
6666

6767
[scalable-git]: https://dekrey.net/articles/scaled-git-flow/
6868
[principle-scalable-git]: https://www.principlestudios.com/article/a-scalable-git-branching-model/
69-
[principle-tools-branching]: https://principle.tools/branching/
69+
[principle-tools-branching]: https://principle.tools/branching/

adr/02-code-organization.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ These utilities should be migrated to the `/utils/input` folder.
5454

5555
### Gather present-state information
5656

57-
Primarily, this stage includes loading configuration data and dependency branch
57+
Primarily, this stage includes loading configuration data and upstream branch
5858
data. This should perform all the data gathering necessary to be able to perform
5959
an automic operation.
6060

6161
Some steps that occur in this stage include:
6262
- Load configuration
6363
- Fetch remote refs
64-
- Load data from _dependency branches
64+
- Load data from _upstream branches
6565
- Ensure the working directory is clean
6666

6767
These utilities should be migrated to the `/utils/loading` folder.
@@ -103,22 +103,22 @@ module.
103103
Under this methodology, the `git new` command would have the basic outline:
104104

105105
1. Input validation and normalization
106-
- Split dependency branches into array
106+
- Split upstream branches into array
107107
- Ensure branch names are valid (using `git check-ref-format`)
108108
2. Gather present-state information
109109
- Fetch from the remote
110-
- Find dependency branches' configurations (recursively)
110+
- Find upstream branches' configurations (recursively)
111111
3. Build initial action list, which would include
112-
- Resolve commit hash for initial dependency branch
113-
- Merge in each other dependency (if any) - if these merges fail, this may abort the `new`
112+
- Resolve commit hash for initial upstream branch
113+
- Merge in each other upstream (if any) - if these merges fail, this may abort the `new`
114114
- Push the new branch based on the final hash
115115
- Checkout the branch locally
116-
- Set dependency branches
116+
- Set upstream branches
117117
4. Resolve local actions
118118
- `Invoke-LocalAction`
119-
- Create commit to track dependency branches in `_dependency`
119+
- Create commit to track upstream branches in `_upstream`
120120
- Merge each branch into the previous hash, tracking the resulting hash
121121
5. Finalize actions
122122
- `Invoke-FinalizeAction`
123-
- A single `git push` would set `_dependency` and create the new branch
124-
- Checkout the new branch
123+
- A single `git push` would set `_upstream` and create the new branch
124+
- Checkout the new branch

0 commit comments

Comments
 (0)