broder: “I give up. I'll let Anders fix it”

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

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index a15e01b..e47035c 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -44,11 +44,11 @@ git filter-branch --tag-name-filter cat -- ^sipb-xen-dns/1~11 ^dns --all
 rm -rf info/grafts refs/original refs/heads/dns
 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
 
 pushd packages/python-routefs.git

diff --git a/svn.yml b/svn.yml
index cd0fbfa..f15e84f 100644 (file)
--- a/svn.yml
+++ b/svn.yml
@@ -10,7 +10,8 @@ packages:
   invirt-console-server:
     {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: {}
   invirt-dns: {}
@@ -100,6 +101,7 @@ scripts:
 - prod-migration
 - vnc-client
 - invirt-admin
+- invirt-test-build
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}