llvm dev - May 2017 - Add more projects into Git monorepo

On Sun, May 7, 2017 at 12:07 AM, NAKAMURA Takumi via llvm-dev <
llvm-dev at lists.llvm.org> wrote:
> I have done just now. 5 repos added including debuginfo-tests.
> ATM, it includes 17 repos total.
>
> - Created the new repo; https://github.com/llvm-
> project/llvm-project-20170507.git
>   Branches will come later.
> - The previous repository has a merge commit that includes new repo. It
> will stick to r302363.
>
Can you update
http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-a-git-monorepo
with new instructions for how to get a monorepo that is up to date?

> - Submodule repo has been pushed with -f.
>
> Rebasing to new branch(es) will take a few minutes. Please be patient.
>
> Thanks, Takumi
>
> On Mon, May 1, 2017 at 11:27 PM NAKAMURA Takumi <geek4civic at
gmail.com>
> wrote:
>
>> I am planing to add projects into https://github.com/llvm-
>> project/llvm-project in near future, possibly this week.
>>
>> Before doing that, I would like to ask users of it.
>> 1st option is my preference in each paragraph. Let me know if you have
>> other suggestions.
>>
>> * What is added?
>>   I will add; libunwind, llgo, openmp and parallel-libs.
>>   May I also add debuginfo-tests?
>>
>> * Will inactive projects be dropped?
>>   I won't do.
>>
>> * Where shall I push the new monorepo?
>>   - Create a new repository, like llvm-project-201705XX, or *-(number
of
>> repos)
>>   - Push new branches into the current llvm-project.git as different
>> branch name, like master-201705XX.
>>   - Force overwrite llvm-project.git/master. I won't do since I was
>> blamed when I tried in the last time.
>>
>> * When I migrate trunk to the new one, how the previous branches will
be?
>>   - Push a merge-commit to the new one. Its commit message will
announce
>> the new repo.
>>   - Leave.
>>   - Update also previous branches as well. (I don't want to do)
>>
>> * What should be done regarding to https://github.com/llvm-
>> project/llvm-project-submodule ?
>>   For consistency, I could create a new repo.
>>   But I think I can overwrite branches, since I assume this is
read-only.
>>
>> Thanks, Takumi
>>
>
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20170508/64671ac6/attachment.html>

I updated the instructions with the new URL in r302459.

If you are an existing user, you can run 'git remote set-url origin
https://github.com/llvm-project/llvm-project-20170507.git' and 'git
reset
--hard origin/master' on the master branch to keep everything in the same
repo. Rebasing existing branches onto master is prohibitively slow and
error prone, so I recommend creating new feature branches and cherry
picking the commits from old branches.

On Mon, May 8, 2017 at 11:57 AM, Reid Kleckner <rnk at google.com> wrote:
> On Sun, May 7, 2017 at 12:07 AM, NAKAMURA Takumi via llvm-dev <
> llvm-dev at lists.llvm.org> wrote:
>
>> I have done just now. 5 repos added including debuginfo-tests.
>> ATM, it includes 17 repos total.
>>
>> - Created the new repo; https://github.com/llvm-
>> project/llvm-project-20170507.git
>>   Branches will come later.
>> - The previous repository has a merge commit that includes new repo. It
>> will stick to r302363.
>>
>
> Can you update http://llvm.org/docs/GettingStarted.html#for-
> developers-to-work-with-a-git-monorepo with new instructions for how to
> get a monorepo that is up to date?
>
>
>> - Submodule repo has been pushed with -f.
>>
>> Rebasing to new branch(es) will take a few minutes. Please be patient.
>>
>> Thanks, Takumi
>>
>> On Mon, May 1, 2017 at 11:27 PM NAKAMURA Takumi <geek4civic at
gmail.com>
>> wrote:
>>
>>> I am planing to add projects into https://github.com/llvm-p
>>> roject/llvm-project in near future, possibly this week.
>>>
>>> Before doing that, I would like to ask users of it.
>>> 1st option is my preference in each paragraph. Let me know if you
have
>>> other suggestions.
>>>
>>> * What is added?
>>>   I will add; libunwind, llgo, openmp and parallel-libs.
>>>   May I also add debuginfo-tests?
>>>
>>> * Will inactive projects be dropped?
>>>   I won't do.
>>>
>>> * Where shall I push the new monorepo?
>>>   - Create a new repository, like llvm-project-201705XX, or
*-(number of
>>> repos)
>>>   - Push new branches into the current llvm-project.git as
different
>>> branch name, like master-201705XX.
>>>   - Force overwrite llvm-project.git/master. I won't do since I
was
>>> blamed when I tried in the last time.
>>>
>>> * When I migrate trunk to the new one, how the previous branches
will be?
>>>   - Push a merge-commit to the new one. Its commit message will
announce
>>> the new repo.
>>>   - Leave.
>>>   - Update also previous branches as well. (I don't want to do)
>>>
>>> * What should be done regarding to https://github.com/llvm-pro
>>> ject/llvm-project-submodule ?
>>>   For consistency, I could create a new repo.
>>>   But I think I can overwrite branches, since I assume this is
read-only.
>>>
>>> Thanks, Takumi
>>>
>>
>> _______________________________________________
>> LLVM Developers mailing list
>> llvm-dev at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20170508/60e807a1/attachment.html>

Even though it said I had on the order of 17,000 different commits, a
simple git pull --rebase finished in a couple of seconds and everything
seems to be working as intended.

On Mon, May 8, 2017 at 1:05 PM Reid Kleckner via llvm-dev <
llvm-dev at lists.llvm.org> wrote:
> I updated the instructions with the new URL in r302459.
>
> If you are an existing user, you can run 'git remote set-url origin
> https://github.com/llvm-project/llvm-project-20170507.git' and 'git
reset
> --hard origin/master' on the master branch to keep everything in the
same
> repo. Rebasing existing branches onto master is prohibitively slow and
> error prone, so I recommend creating new feature branches and cherry
> picking the commits from old branches.
>
> On Mon, May 8, 2017 at 11:57 AM, Reid Kleckner <rnk at google.com>
wrote:
>
>> On Sun, May 7, 2017 at 12:07 AM, NAKAMURA Takumi via llvm-dev <
>> llvm-dev at lists.llvm.org> wrote:
>>
>>> I have done just now. 5 repos added including debuginfo-tests.
>>> ATM, it includes 17 repos total.
>>>
>>> - Created the new repo;
>>> https://github.com/llvm-project/llvm-project-20170507.git
>>>   Branches will come later.
>>> - The previous repository has a merge commit that includes new
repo. It
>>> will stick to r302363.
>>>
>>
>> Can you update
>>
http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-a-git-monorepo
>> with new instructions for how to get a monorepo that is up to date?
>>
>>
>>> - Submodule repo has been pushed with -f.
>>>
>>> Rebasing to new branch(es) will take a few minutes. Please be
patient.
>>>
>>> Thanks, Takumi
>>>
>>> On Mon, May 1, 2017 at 11:27 PM NAKAMURA Takumi <geek4civic at
gmail.com>
>>> wrote:
>>>
>>>> I am planing to add projects into
>>>> https://github.com/llvm-project/llvm-project in near future,
possibly
>>>> this week.
>>>>
>>>> Before doing that, I would like to ask users of it.
>>>> 1st option is my preference in each paragraph. Let me know if
you have
>>>> other suggestions.
>>>>
>>>> * What is added?
>>>>   I will add; libunwind, llgo, openmp and parallel-libs.
>>>>   May I also add debuginfo-tests?
>>>>
>>>> * Will inactive projects be dropped?
>>>>   I won't do.
>>>>
>>>> * Where shall I push the new monorepo?
>>>>   - Create a new repository, like llvm-project-201705XX, or
*-(number
>>>> of repos)
>>>>   - Push new branches into the current llvm-project.git as
different
>>>> branch name, like master-201705XX.
>>>>   - Force overwrite llvm-project.git/master. I won't do
since I was
>>>> blamed when I tried in the last time.
>>>>
>>>> * When I migrate trunk to the new one, how the previous
branches will
>>>> be?
>>>>   - Push a merge-commit to the new one. Its commit message will
>>>> announce the new repo.
>>>>   - Leave.
>>>>   - Update also previous branches as well. (I don't want to
do)
>>>>
>>>> * What should be done regarding to
>>>> https://github.com/llvm-project/llvm-project-submodule ?
>>>>   For consistency, I could create a new repo.
>>>>   But I think I can overwrite branches, since I assume this is
>>>> read-only.
>>>>
>>>> Thanks, Takumi
>>>>
>>>
>>> _______________________________________________
>>> LLVM Developers mailing list
>>> llvm-dev at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>>
>>>
>>
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20170508/bb5ffd30/attachment-0001.html>