Index: trunk/scripts/git-migration/git-migrate-fast.sh
===================================================================
--- trunk/scripts/git-migration/git-migrate-fast.sh	(revision 2355)
+++ trunk/scripts/git-migration/git-migrate-fast.sh	(revision 2356)
@@ -23,17 +23,15 @@
 svn-all-fast-export --identity-map ../authors ../rules "$SVN"
 
-sed -n 's/^create repository // p' ../rules | while read repo; do
-    if [ -e "$repo/refs/heads/tags" ]; then
-        cp -a "$repo/refs/heads/tags/." "$repo/refs/tags"
-        rm -rf "$repo/refs/heads/tags"
-    fi
-done
+pushd packages/invirt-dev.git
+GIT_COMMITTER_NAME='Eric Price' GIT_COMMITTER_EMAIL='ecprice@mit.edu' GIT_COMMITTER_DATE='1206829393 -0400' \
+    git tag -a sipb-xen-dev/13 sipb-xen-dev/14~2 -F - <<EOF
+Tag 13 of sipb-xen-dev
 
-pushd packages/invirt-dev.git
-git tag sipb-xen-dev/13 sipb-xen-dev/14~2
+svn path=/package_tags/sipb-xen-dev/13/; revision=316
+EOF
 popd
 
 pushd packages/invirt-remote.git
-echo $(git rev-parse 0.2.0 invirt-remote-server invirt-remote-host) >> info/grafts
+echo $(git rev-parse 0.2.0^0 invirt-remote-server invirt-remote-host) >> info/grafts
 git filter-branch --tag-name-filter cat -- ^invirt-remote-server ^invirt-remote-host --all
 rm -rf info/grafts refs/original refs/heads/invirt-remote-server refs/heads/invirt-remote-host
@@ -41,5 +39,5 @@
 
 pushd packages/invirt-console.git
-echo $(git rev-parse 0.2.0 0.2.0^ invirt-console-host) >> info/grafts
+echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-console-host) >> info/grafts
 git filter-branch --tag-name-filter cat -- ^0.2.0^ ^invirt-console-host --all
 rm -rf info/grafts refs/original refs/heads/invirt-console-host
@@ -53,6 +51,6 @@
 
 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
+echo $(git rev-parse invirt-database-server/0.0.1^0 0.0.1^) >> info/grafts
+echo $(git rev-parse 0.2.0^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
Index: trunk/scripts/git-migration/rules.mako
===================================================================
--- trunk/scripts/git-migration/rules.mako	(revision 2355)
+++ trunk/scripts/git-migration/rules.mako	(revision 2356)
@@ -67,5 +67,6 @@
 match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}
-  branch tags/${get_tag_prefix(package)}\1
+  branch refs/tags/${get_tag_prefix(package)}\1
+  annotated true
   max revision ${packages[package]['undouble'][0] - 1}
 end match
@@ -95,5 +96,6 @@
 match /package_tags/${package}/([^/~]+)/
   repository ${get_repo(package)}
-  branch tags/${get_tag_prefix(package)}\1
+  branch refs/tags/${get_tag_prefix(package)}\1
+  annotated true
 %   if 'undouble' in packages[package]:
   min revision ${packages[package]['undouble'][1]}
@@ -103,5 +105,6 @@
 match /package_tags/${package}/([^/~]+)~([^/~]+)/
   repository ${get_repo(package)}
-  branch tags/${get_tag_prefix(package)}\1_\2
+  branch refs/tags/${get_tag_prefix(package)}\1_\2
+  annotated true
 %   if 'undouble' in packages[package]:
   min revision ${packages[package]['undouble'][1]}
@@ -175,5 +178,6 @@
 match /third_tags/${t}/([^/~]+)/
   repository third/${t}.git
-  branch tags/\1
+  branch refs/tags/\1
+  annotated true
 end match
 % endfor