[llvm-dev] New LLVM git repository conversion prototype

[Jeremy Lakeman via llvm-dev]

On 17 October 2018 at 08:46, James Y Knight via llvm-dev <
llvm-dev at lists.llvm.org> wrote:

> On Mon, Oct 15, 2018 at 7:58 AM Danila Malyutin <
> danila.malyutin at synopsys.com> wrote:
>
>> Great to hear!
>>
>> Are there some migrations strategies for those who are using llvm-mirror
>> repositories?
>>
>>
> It'd be great if someone wrote down some exact step-by-step instructions
> for this. :)
>
> But, basically -- if you're migrating from another monorepo repository
> with the same layout, but different hashes, I find the easiest procedure is
> to simply add the new upstream into your existing repository and then
> rebase your branches onto the new upstream.
>
> An alternative scheme, which has the advantage of also working if you're
> converting from separate repositories to a monorepo, is to run something
> like "git format-patch --stdout origin/master..mybranch > mybranch.patch",
> for each of your branches you want to save, and then, in a new repo, create
> new branches, and use "git am" to apply your patch. If you're converting
> from non-monorepo, then you can use the "--directory" argument to "git am"
> to apply the patch onto a subdirectory of the repository.
>
>
There's probably a way to use git filter-branch with .git/info/grafts to
preserve complicated merge histories. If you have any of those. Though
changes to the folder structure will likely complicate that approach.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20181017/2ce9e41a/attachment.html>