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

[invirt/scripts/git-migration.git] / git-migrate-fast.sh

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index 35606fa..1cde7d5 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -57,12 +57,25 @@ git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
 rm -rf info/grafts refs/original refs/heads/invirt-database-server
 popd
 
 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
 git branch -f prod 1.0.1-1
 popd
 
 pushd packages/python-routefs.git
 git fetch -t git://github.com/ebroder/python-routefs.git
 git branch -f upstream 1.0.1
 git branch -f prod 1.0.1-1
 popd
 

+pushd packages/python-afs.git
+git fetch -t git://github.com/ebroder/pyafs.git
+git branch -f upstream 0.1.1
+git branch -f prod 0.1.1-1
+popd
+

 for r in $(ls packages); do
     pushd "packages/$r"
     git branch dev prod
 for r in $(ls packages); do
     pushd "packages/$r"
     git branch dev prod