Merge commit history from previous repo

[chorrell]

As noted in the comments of #3, figure out how to merge the commit history from the previous repo: https://github.com/docker-library/node

[CrocoDillon]

I was able to pull in the old commit history by rebasing the master branch onto the commit where you started from. Steps to reproduce (assumes you're on master):

# Add the old repo as remote to be able to rebase onto its commits
git remote add old git@github.com:docker-library/node.git
git fetch old
# Just to be safe backup the master branch
git branch master-backup
# I believe this is your starting point, so rebase onto that commit
# https://github.com/docker-library/node/commit/57dd55534374b98309c13cd19e00691f5479ddf0
git rebase --keep-empty --preserve-merges --root --onto 57dd555 master
# Resolve first conflict by removing some files you did not copy to this repo
git rm LICENSE
git rm generate-stackbrew-library.sh
git rm update.sh
git status # Just to verify everything is okay so far
git rebase --continue
# I had another conflict and I don't know where it's coming from but I had two identical files, I just removed one
rm 0.8/wheezy/Dockerfile~35e68206f2c45fbf54d3c166c360dcbd8fdaf9e1
git add -A
git status # Again to verify
git rebase --continue

That did the trick. If it didn't work you can always reset the master branch to the backup with:

git reset --hard master-backup

[chorrell]

Cool, thanks!

[SimenB]

I'm thinking this is too late at this point?

[LaurentGoderre]

Why not have a legacy branch just for reference purpose?

[chorrell]

Yeah, that might work.

And yes, so much time has passed that I don't think it's worth merging in the previous commit history.

[chorrell]

This has been lingering for a while. I'm inclined to close it out.