Merge ~xnox/ubiquity:subtree-squash into ubiquity:master
Proposed by
Dimitri John Ledkov
Status: | Rejected |
---|---|
Rejected by: | Dimitri John Ledkov |
Proposed branch: | ~xnox/ubiquity:subtree-squash |
Merge into: | ubiquity:master |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Disapprove | ||
Canonical Foundations Team | Pending | ||
Ubuntu Desktop | Pending | ||
Review via email: mp+385614@code.launchpad.net |
Commit message
3rd option of subtree add --squash
This is similar to subtree, but instead of full history for every d-i component, there is just a single commit.
We can develop/
This is closer to how "git add d-i/source" would look like, but with enough git subtree --prefix automation to allow easier subtree updates in the future.
This repository is the smallest, yet contains the full source code, as uploaded in dsc form.
To post a comment you must log in.
Unmerged commits
- 70db1df... by Dimitri John Ledkov
- 2bd0fa8... by Dimitri John Ledkov
- a5f07aa... by Dimitri John Ledkov
- 228476d... by Dimitri John Ledkov
- 6349e06... by Dimitri John Ledkov
- 0adcbd4... by Dimitri John Ledkov
- 1012c44... by Dimitri John Ledkov
- 9cae360... by Dimitri John Ledkov
- f095c14... by Dimitri John Ledkov
- 6c76ecf... by Dimitri John Ledkov
I feel like we dislike this option, as althought changes to squashed subtrees are allowed, they do not contain the full history, and one cannot pull/push/merge from these directly like one can from the full trees.