Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make revision history linear #4

Closed
snomos opened this issue Sep 3, 2020 · 2 comments
Closed

Make revision history linear #4

snomos opened this issue Sep 3, 2020 · 2 comments
Assignees
Labels
bug Something isn't working

Comments

@snomos
Copy link
Member

snomos commented Sep 3, 2020

Presently the revision history is as follows:

Bilde 03 09 2020 klokken 13 50

I would like the highlighted merge to be deleted, and the parent commits be ordered sequencially and chronologically.

Reason: I have a recollection that a linear revision history is an implicit requirement of gut template apply, and the delta algorithm. If I am mistaken, and it has no bearing, please just close.

We are experiencing four repos that are not template mergable (ie nothing happens), and suspect that this might be related/the reason.

@snomos
Copy link
Member Author

snomos commented Sep 3, 2020

If rewriting history creates new sha's (which it most likely will), the sha of all language repos (.gut/delta.toml) has to be updated correspondingly, so that the correct sha is found when doing the next template merge.

@snomos
Copy link
Member Author

snomos commented Sep 4, 2020

Fixed in the latest commits.

NB! Did force-push, so make sure to pull before editing further.

@snomos snomos closed this as completed Sep 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants