[email protected] said: > As step 1, I've adjusted the build scripts of -baremetal and -xen so > that they work even if buildrump.sh and rumpsrc are in ../. > > As step 2, I'll move the contents of the repos so that they'll be > non-overlapping with respect to each other. So for example -xen > will look like: > > / > buildxen.sh > rumpsrc/ > buildrump.sh/ > xen/ > _buildxen.sh > [current contents of rumprun-xen/] > > I don't think the move will kill any branches, but it will produce a > directory structure that will be present in the final version. > > I'd like to get the destructive merge done already this week > (thursday?) so as to not leave the reorg as one of those lingering > pie-in-the-sky pieces that was never done because there never was a > perfect time for it.
What would be the step 3? Do a "git pull rumprun-xen master" and "git pull rumprun-baremetal master" into the new rumprun repository? 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. -mato
