<div dir="ltr">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.</div><br><div class="gmail_quote"><div dir="ltr">On Mon, May 8, 2017 at 1:05 PM Reid Kleckner via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I updated the instructions with the new URL in r302459.<div><br></div><div>If you are an existing user, you can run 'git remote set-url origin <a href="https://github.com/llvm-project/llvm-project-20170507.git" target="_blank">https://github.com/llvm-project/llvm-project-20170507.git</a>' 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.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, May 8, 2017 at 11:57 AM, Reid Kleckner <span dir="ltr"><<a href="mailto:rnk@google.com" target="_blank">rnk@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><span>On Sun, May 7, 2017 at 12:07 AM, NAKAMURA Takumi via llvm-dev <span dir="ltr"><<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">I have done just now. 5 repos added including debuginfo-tests.<div>ATM, it includes 17 repos total.<br><div><br></div><div>- Created the new repo; <a href="https://github.com/llvm-project/llvm-project-20170507.git" target="_blank">https://github.com/llvm-project/llvm-project-20170507.git</a></div><div> Branches will come later.</div><div>- The previous repository has a merge commit that includes new repo. It will stick to r302363.</div></div></div></blockquote><div><br></div></span><div>Can you update <a href="http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-a-git-monorepo" target="_blank">http://llvm.org/docs/GettingStarted.html#for-developers-to-work-with-a-git-monorepo</a> with new instructions for how to get a monorepo that is up to date?</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span><div dir="ltr"><div><div>- Submodule repo has been pushed with -f.</div><div><br></div><div>Rebasing to new branch(es) will take a few minutes. Please be patient.</div><div><br></div><div>Thanks, Takumi</div></div></div><div class="m_-9095703279271974558m_4782964997983597535gmail-HOEnZb"><div class="m_-9095703279271974558m_4782964997983597535gmail-h5"><br><div class="gmail_quote"><div dir="ltr">On Mon, May 1, 2017 at 11:27 PM NAKAMURA Takumi <<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">I am planing to add projects into <a href="https://github.com/llvm-project/llvm-project" target="_blank">https://github.com/llvm-project/llvm-project</a> in near future, possibly this week.<div><br></div><div>Before doing that, I would like to ask users of it.</div><div>1st option is my preference in each paragraph. Let me know if you have other suggestions.</div><div><br></div><div>* What is added?</div><div> I will add; libunwind, llgo, openmp and parallel-libs.</div><div> May I also add debuginfo-tests?</div><div><br></div><div>* Will inactive projects be dropped?</div><div> I won't do.</div><div><br></div><div>* Where shall I push the new monorepo?</div><div> - Create a new repository, like llvm-project-201705XX, or *-(number of repos)</div><div> - Push new branches into the current llvm-project.git as different branch name, like master-201705XX.</div><div> - Force overwrite llvm-project.git/master. I won't do since I was blamed when I tried in the last time.</div><div><br></div><div>* When I migrate trunk to the new one, how the previous branches will be?</div><div> - Push a merge-commit to the new one. Its commit message will announce the new repo.</div><div> - Leave.</div><div> - Update also previous branches as well. (I don't want to do)</div><div><br></div><div>* What should be done regarding to <a href="https://github.com/llvm-project/llvm-project-submodule" target="_blank">https://github.com/llvm-project/llvm-project-submodule</a> ?</div><div> For consistency, I could create a new repo.</div><div> But I think I can overwrite branches, since I assume this is read-only.</div><div><br></div><div>Thanks, Takumi</div></div></blockquote></div>
</div></div><br></span><span>_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
<br></span></blockquote></div><br></div></div>
</blockquote></div><br></div>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote></div>