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
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/merge/rebase repos in lp:~ubuntu-installer/$project as usual, and then just single commit update them in the ubiuqity repo.

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.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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.

review: Disapprove

Unmerged commits

70db1df... by Dimitri John Ledkov

Merge commit '2bd0fa852729d04b22d32e143230ed023a8b91e4' as 'd-i/source/user-setup'

2bd0fa8... by Dimitri John Ledkov

Squashed 'd-i/source/user-setup/' content from commit e24f6c0d1c

git-subtree-dir: d-i/source/user-setup
git-subtree-split: e24f6c0d1c32f141b236662017df43031119c125

a5f07aa... by Dimitri John Ledkov

Merge commit '228476d6233c7fb6cec9861848fec21214f69505' as 'd-i/source/tzsetup'

228476d... by Dimitri John Ledkov

Squashed 'd-i/source/tzsetup/' content from commit 6d589374e2

git-subtree-dir: d-i/source/tzsetup
git-subtree-split: 6d589374e2cc70309452c016d9aaa804d78dd95e

6349e06... by Dimitri John Ledkov

Merge commit '0adcbd420813ac636128fbbdd04c4f859a6d95ca' as 'd-i/source/preseed'

0adcbd4... by Dimitri John Ledkov

Squashed 'd-i/source/preseed/' content from commit a51c17f4ba

git-subtree-dir: d-i/source/preseed
git-subtree-split: a51c17f4baad7235ea1c199ed77efb7e1359587e

1012c44... by Dimitri John Ledkov

Merge commit '9cae360d28c2c1072674a27e7565ca2ed57b5d39' as 'd-i/source/partman-xfs'

9cae360... by Dimitri John Ledkov

Squashed 'd-i/source/partman-xfs/' content from commit 8baf362e2a

git-subtree-dir: d-i/source/partman-xfs
git-subtree-split: 8baf362e2ae350a923c35aaec4282473883a9e69

f095c14... by Dimitri John Ledkov

Merge commit '6c76ecf88c34ea2fbff055cf6f3c35b5af0514fe' as 'd-i/source/partman-target'

6c76ecf... by Dimitri John Ledkov

Squashed 'd-i/source/partman-target/' content from commit f8f6185055

git-subtree-dir: d-i/source/partman-target
git-subtree-split: f8f6185055cdc9a9e12cefab626a3f9fd77ddce9

Subscribers

People subscribed via source and target branches