[email protected] said: > I'll write a script to do it your way and send it to the list shortly.
The following almost works. Except that the final step when I move the from-X directories to the final X causes "git mv" to segfault. Sigh. The reason for the from-X is that we already have a directory called "xen" in the "xen" repo. So perhaps that should be moved to "mini-os" first and then this will work. ---- mkdir rumprun-merged cd rumprun-merged git init echo "Dummy file" > DUMMY git add DUMMY git commit -m "Dummy" git checkout -b from-xen master git pull [email protected]:rumpkernel/rumprun-xen master mkdir from-xen git ls-tree --name-only HEAD | grep -v DUMMY | xargs -I FILES git mv FILES from-xen git commit -m "Moving xen to from-xen/ subdirectory" git checkout -b from-baremetal master git pull [email protected]:rumpkernel/rumprun-baremetal master mkdir from-baremetal git ls-tree --name-only HEAD | grep -v DUMMY | xargs -I FILES git mv FILES from-baremetal git commit -m "Moving baremetal to from-baremetal/ subdirectory" git checkout master git merge from-xen git merge from-baremetal #git mv from-baremetal baremetal #git mv from-xen xen #git rm -f DUMMY #git commit -m "Cleanup"
