Pull svmbatch development history into main MethodsCore repo

[dankessler]

This was prompted by issue #18, which requested that the svmbatch history be integrated into the main methods core repository.

I did some git wizardry to make this cleaner, which I'll explain here and may help in the future.

My goal was for development of this to look like it had branched off of MethodsCore, rather than being developed independently. This required me to use some fancy filter-branch and rebase tricks.

Development Repository (svmbatch)

First, I went to the svmbatch repository where I had been developing all of this as the root tree.

Clean Up History

To clean up the history, which included some merges I didn't care about seeing as merges, I ran

git rebase

Filter-branch to put root in subtree

My goal was for it to look as if I had developed everything in a subtree called /svmbatch/

git filter-branch --tree-filter '
mkdir -p svmbatch ;
mv `ls | grep -xv svmbatch` svmbatch/' HEAD

This went and, and for each commit reachable from HEAD (my current branch)

1. Checked out the tree associated with each commit
2. made directory svmbatch if it didn't already exist. the -p flag (among other things) suppresses errors when that subdirectory already exists
3. moves all content (except for svmbatch itself) into svmbatch
4. Recommits it

in my local MethodsCore repo

I next needed to read in this history, and make it look like it had branched off of MethodsCore's develop branch

Reading in the data

git remote add svmbatch <path to svmbatch repository> #this adds a new remote named svmbatch
git fetch svmbatch

When I run this I get a complaint about not common commits, which is totally to be expected since they their histories don't intersect. We'll fix this in a minute.

You can appreciate the nonintersection if you run gitk --all and you'll see the two unconnected lineages.

Basing things on develop

git checkout remotes/svmbatch/<branchname> -b svmbatch #checkout the remote branch as a local one
git rebase --onto develop --root #This will include the delta of current branch's root commit vs a hypothetical empty commit

All Done!

Go ahead and run gitk --all and you'll now see that it looks as if I grabbed MethodsCore, checked out develop as a new branch called svmbatch, then did all of my work in the subtree svmbatch (of course, the time stamps suggest otherwise).

[dankessler]

I'm going to assume this is ok with everybody and go ahead and merge it in.