[PATCH] D56550: Add recipes for migrating downstream branches of git mirrors

[James Y Knight via Phabricator via llvm-commits]

jyknight added a comment.

In D56550#1353093 <https://reviews.llvm.org/D56550#1353093>, @greened wrote:

> Do a lot of people use the old monorepo for development?  We don't so I haven't developed any process for migrating from that.  I'll leave that to someone else to add.
>
> Migrating from SVN is way more painful and again, I'll leave that to someone else to document.  :)
>
> Obviously I'm biased, but I don't think these tools are all that scary.  `git-rebase`ing multiple downstream merge commits on top of upstream master is **way** more scary to me.  You need a relatively new git to do it properly and even then I don't know how well it's tested.  If the downstream branches don't have any merges it's much easier but how likely is that?  We merge from upstream regularly and I know of other downstream users that do the same.
>
> Maybe I'm misreading the zeitgeist but as @bogner suggested in D53414 <https://reviews.llvm.org/D53414>, downstream branches with merges is almost certainly the most likely scenario.


Oh yes,  it's 100% the most likely scenario for downstream forks with (e.g. shared internally to another org). But what I mean is that there's a lot of individual developers with their own private work-in-progress local *UNSHARED* repositories and checkouts, which will likely have no (important/intentional) merge commits because they're just working on patches to submit upstream.

Those migrations are going to be the most common, and such people shouldn't think they need to use these migration tools when a simple git rebase or format-patch/apply would likely be more appropriate.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D56550/new/

https://reviews.llvm.org/D56550