From: Evan Broder <broder@mit.edu>
Date: Mon, 21 Dec 2009 05:51:37 +0000 (-0500)
Subject: Cleanup invirt-web's cherrypy-rebased -> trunk merge in the git-migration
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/commitdiff_plain/6cd8f7d2c08eb975fe11c92c9534ccd18714634d

Cleanup invirt-web's cherrypy-rebased -> trunk merge in the git-migration

svn path=/trunk/scripts/git-migration/; revision=2745
---

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index f3bfd54..1cde7d5 100755
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -57,6 +57,13 @@ git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
 rm -rf info/grafts refs/original refs/heads/invirt-database-server
 popd
 
+pushd packages/invirt-web.git
+echo $(git rev-parse 0.1.0^0 0.0.24^0 cherrypy-rebased^1) >> info/grafts
+echo $(git rev-parse 0.1.1~3 0.1.0^0 cherrypy-rebased^0) >> info/grafts
+git filter-branch --tag-name-filter cat -- ^0.0.24^ --all
+rm -rf info/grafts refs/original
+popd
+
 pushd packages/python-routefs.git
 git fetch -t git://github.com/ebroder/python-routefs.git
 git branch -f upstream 1.0.1