search

giellalt / template-lang-und

A template repo for new languages, as well as to update existing language repos with.
https://giellalt.uit.no/
GNU Lesser General Public License v3.0
2 stars 1 forks source link

Make revision history linear #4

Closed snomos closed 4 years ago

snomos commented 4 years ago

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 commented 4 years ago

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 commented 4 years ago

Fixed in the latest commits.

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