search

jyknight / llvm-git-migration

7 stars 6 forks source link

Add zipping tool #2

Closed greened closed 5 years ago

greened commented 5 years ago

Add a tool to take a set of migrated downstream refs and zip them, interleaving commits as directed by a provided "umbrella" branch. The umbrella is expected to be a series of submodule update commits, possibly interspersed with commits that do not update submodules. Commits that do not update submodules are ignored.

For each commit updating submodules, the tool rewrites the commit with the changes in the corresponding migrated downstream commits and takes care to preserve merges from upstream commits. The end result is a branch that has all of the sumodule updates "inlined" into a single history.

greened commented 5 years ago

Hi James,

Is this something you'll want to merge? If so, are there any changes you want to see?

jyknight commented 5 years ago

While I don't really want to maintain these extra tools which is why I've been hesitating on pulling this, I think it's reasonable to include them all together in one place, so I'm just going to accept the PR.

Thanks!