[openstack-dev] [kolla][kubernetes] One repo vs two

Jeff Peeler jpeeler at redhat.com
Mon May 2 15:53:06 UTC 2016

On Mon, May 2, 2016 at 9:50 AM, Andreas Jaeger <aj at suse.com> wrote:
> On 05/02/2016 03:05 PM, Steven Dake (stdake) wrote:
>> Swapnil,
>> I gather this is what people want but this cannot be done with git and
>> maintain history.  To do this, we would have to "cp oldrepo/files to
>> newrepo/files" and the git history would be lost.  That is why choosing
>> two repositories up front is irreversible.
> On the other hand: If you start with one and want to split later, you can
> use git-filter to create a copy of the repo with just the kubernetes files
> in it and set up a new repository with that content. So, you would keep the
> history...

Andreas, could you also not do the reverse with two separate
repositories and merge them to preserve the history using subtree
merging [1]? If I'm not correct, I'm sure repository merging can be
done somehow as Linus merged gitk into git years ago with history
preservation. So really, I don't think git history should be part of
this discussion.

[1] https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

More information about the OpenStack-dev mailing list