Hi Luke, On Sat, Jul 01, 2017 at 03:43:35PM +0200, Luke Gorrie wrote:
In mcz/monticello, every package has an independent history and can change independently of each other. In git, this history is merged into a single hierarchy, therefore:
Git does not strictly require you to put all of your commits into a single hierarchy. You can also have multiple root commits in the same repository i.e. multiple parallel hierarchies of commits. Then you can combine these together with merge commits if/when you want to have them in the same tree (afaik.)
See 'git commit --orphan' for introducing a new root commit into the repo.
I don't really see a difference between having orphaned branches and regular branches starting from the initial commit.
So thinking aloud...
Perhaps for each package could you create a dedicated branch (A, B, ...) with its own root commit? This way each package would have a distinct history on its private branch and not be prone to collisions. If you want to combine multiple packages into one tree then you could create a new branch (A+B) that merges the required per-package branches (which remain isolated and pristine.)
Just an idea -- sorry if I have misunderstood your use case, and let me know if this idea requires more explanation.
I do understand what you have in mind, however one aspect I didn't mention is usability. People are already complaining (for whatever reason that I do not understand) that git is too complex. And doing this kind of shenanigans with branches will certainly add extra complexity. Also as I've mentioned neither of workflows (MCZ or git) are best. With git having packages depend on commits of another packages can be a good thing (because realistically packages in a project do depend on each other). But maybe a solution for migration itself would be to strictly separate the package histories, and then in master branch perform merges based on ConfigurationOf versions... and the last commit on master would merge all the branches according the the current dev state. Or maybe I am really overthinking this and nobody actually cares about proper migration of their history. :) Peter
Cheers, -Luke