On 3 March 2015 at 09:39, Martin Lucina <[email protected]> wrote: > What would be the step 3? Do a "git pull rumprun-xen master" and "git pull > rumprun-baremetal master" into the new rumprun repository?
step 3 ... profit! > I did some research and found an alternative approach, which is to use > git-subtree to pull in the existing repositories as subtrees of the new > repositories. You need a new enough git with subtree support, I have 1.9.1 > and it seems to work: > > git clone [email protected]:rumpkernel/rumprun > [This repository is currently empty, so add and commit a dummy README file > otherwise the following fails] > git subtree add --prefix=xen [email protected]:rumpkernel/rumprun-xen master > git subtree add --prefix=baremetal > [email protected]:rumpkernel/rumprun-baremetal master > git push origin master > > I've tried this locally and it seems to produce what we want. I have pushed > the result to https://github.com/mato/rumprun-test if you want to take a > look. Isn't that mainly a different version of submodules where the subtrees are going to continue to exist and you may want to pull changes? Don't we just want to do a straight merge to keep the histories and then phase out the old repos? Justin
