[llvm-dev] [RFC] One or many git repositories?

[Justin Lebar via llvm-dev]

> If I try to push from my sparse checkout, but something that I don't
> have in the checkout has changed, do I still need to rebase first?

Without trying it, yes, because git commits are git commits.

But you do not have to rebuild and retest everything, nor does the act
of rebasing necessarily update your llvm checkout, if you've made it
independent.  And the rebase will have conflicts if and only if you
would have had rebase conflicts in the multirepo world.

One could have a script that does the rebase and push in one shot if
typing two commands on submit is really a big deal.

FWIW git svn dcommit does the rebase implicitly -- in the monorepo or
multirepo worlds, we are all going to have to type "git rebase" more
often (unless we use a script).

On Wed, Jul 27, 2016 at 2:24 PM, Robinson, Paul <paul.robinson at sony.com> wrote:
>
>
>> -----Original Message-----
>> From: llvm-dev [mailto:llvm-dev-bounces at lists.llvm.org] On Behalf Of
>> Justin Lebar via llvm-dev
>> Sent: Wednesday, July 27, 2016 1:32 PM
>> To: Chris Bieneman
>> Cc: llvm-dev at lists.llvm.org
>> Subject: Re: [llvm-dev] [RFC] One or many git repositories?
>>
>> Thanks for elaborating, Chris.
>>
>> > Case Study 1 - Simple development on a sub-project
>>
>> I explicitly addressed this workflow in my original e-mail.  I know it
>> was a while ago, but it sounds like it may be worth a read if you
>> haven't checked it out.
>>
>> In the mail I described how to use sparse checkouts to create a
>> repository structure that functions virtually identically to what you
>> have today.  It takes a few copy-pastable commands to set up.  If
>> these few commands are a pain, we can write a script and check it in
>> to llvm.
>
> If I try to push from my sparse checkout, but something that I don't
> have in the checkout has changed, do I still need to rebase first?
> --paulr
>