Manual sync with google code repository (no history).

I have gone through with diffmerge and manually brought in the latest changes from the google code repo.  This of course has no history.

Also note I have separately done a git-svn checkout of the code to https://github.com/drusk/opencadc.
Using this I would be able to make commits and push to my git repo without accessing the main SVN repo until we are ready to merge in our branch.  Theoretically this would allow us to keep the commit history generated through git and transfer it to SVN.  It would also allow us to keep pulling in their changes.  Therefore there are some definite advantages of this method.  However, I wouldn't be able to send you things as pull requests.

Which way do you think is better?