Revert r2030. I'm an idiot.

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

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index 86dbebe..a15e01b 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -13,14 +13,19 @@ sed -n 's/^create repository // p' ../rules | while read repo; do
     mkdir -p "$repo" && GIT_DIR="$repo" git init --bare
 done
 
-svn-all-fast-export --identity-map <(sed 's/= //' ../authors) ../rules "$SVN"
+svn-all-fast-export --identity-map ../authors ../rules "$SVN"
 
 sed -n 's/^create repository // p' ../rules | while read repo; do
-    ! [ -e "$repo/refs/heads/tags" ] || \
-       cp -a "$repo/refs/heads/tags/." "$repo/refs/tags" && \
-       rm -rf "$repo/refs/heads/tags"
+    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 tag sipb-xen-dev/13 sipb-xen-dev/14~2
+popd
+
 pushd packages/invirt-remote.git
 echo $(git rev-parse 0.2.0 invirt-remote-server invirt-remote-host) >> info/grafts
 git filter-branch --tag-name-filter cat -- ^invirt-remote-server ^invirt-remote-host --all
@@ -39,12 +44,17 @@ 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/libyaml.git
-git fetch git://andersk.mit.edu/libyaml.git refs/tags/upstream/0.1.1:refs/tags/upstream/0.1.1 refs/tags/debian/0.1.1-1:refs/tags/debian/0.1.1-1
-git branch upstream upstream/0.1.1
-echo $(git rev-parse 0.1.1-1_andersk1 debian/0.1.1-1^0) >> info/grafts
-git filter-branch --tag-name-filter cat -- ^debian/0.1.1-1 --all
-rm -rf info/grafts refs/original
+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
+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 master 1.0.1-1
 popd
 
 echo