Index: trunk/scripts/git-migration/git-migrate-fast.sh
===================================================================
--- trunk/scripts/git-migration/git-migrate-fast.sh	(revision 2234)
+++ trunk/scripts/git-migration/git-migrate-fast.sh	(revision 2236)
@@ -45,9 +45,9 @@
 popd
 
-pushd packages/invirt-database-server.git
-git fetch ../invirt-database.git refs/tags/0.0.1:refs/heads/tmp
-echo $(git rev-parse 0.0.1 refs/heads/tmp^) >> info/grafts
-git filter-branch --tag-name-filter cat -- ^refs/heads/tmp --all
-rm -rf info/grafts refs/original refs/heads/tmp
+pushd packages/invirt-database.git
+echo $(git rev-parse invirt-database-server/0.0.1 0.0.1^) >> info/grafts
+echo $(git rev-parse 0.2.0 0.2.0^ invirt-database-server) >> info/grafts
+git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
+rm -rf info/grafts refs/original refs/heads/invirt-database-server
 popd
 
Index: trunk/scripts/git-migration/svn.yml
===================================================================
--- trunk/scripts/git-migration/svn.yml	(revision 2234)
+++ trunk/scripts/git-migration/svn.yml	(revision 2236)
@@ -11,5 +11,6 @@
     {punt: 1813, merge: invirt-console}
   invirt-database: {}
-  invirt-database-server: {}
+  invirt-database-server:
+    {punt: 2218, merge: invirt-database, branch: invirt-database-server}
   invirt-dev: {}
   invirt-dhcp: {}
@@ -101,4 +102,5 @@
 - vnc-client
 - invirt-admin
+- invirt-test-build
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}