Add trunk/dns and epic grafting.

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

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index 2fdbe30..86dbebe 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -20,3 +20,32 @@ sed -n 's/^create repository // p' ../rules | while read repo; do
        cp -a "$repo/refs/heads/tags/." "$repo/refs/tags" && \
        rm -rf "$repo/refs/heads/tags"
 done
        cp -a "$repo/refs/heads/tags/." "$repo/refs/tags" && \
        rm -rf "$repo/refs/heads/tags"
 done

+
+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
+rm -rf info/grafts refs/original refs/heads/invirt-remote-server refs/heads/invirt-remote-host
+popd
+
+pushd packages/invirt-console.git
+echo $(git rev-parse 0.2.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
+popd
+
+pushd packages/invirt-dns.git
+echo $(git rev-parse sipb-xen-dns/1~10 sipb-xen-dns/1~11 dns) >> info/grafts
+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
+popd
+
+echo
+echo 'The Git migration was successful.'

diff --git a/rules.mako b/rules.mako
index 120302e..415b5c3 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -35,8 +35,8 @@
         'sipb-xen-dhcp': 1436,
         'sipb-xen-autoinstaller': 1569,
         'sipb-xen-clvm-config': 1569,
         'sipb-xen-dhcp': 1436,
         'sipb-xen-autoinstaller': 1569,
         'sipb-xen-clvm-config': 1569,

-        'invirt-console-host': 1816,
-        'invirt-console-server': 1816,
+        'invirt-console-host': 1815,
+        'invirt-console-server': 1813,

         'invirt-remote-host': 1822,
         'invirt-remote-server': 1822,
     }
         'invirt-remote-host': 1822,
         'invirt-remote-server': 1822,
     }

@@ -208,7 +208,13 @@ match /trunk/vnc/vnc_server(/|$)
   max revision 286
 end match
 
   max revision 286
 end match
 

-match /trunk/(dns|scripts|vmctl)(/|$)
+match /trunk/dns(/|$)
+  repository ${get_repo('sipb-xen-dns')}
+  branch dns
+  max revision 268
+end match
+
+match /trunk/(scripts|vmctl)(/|$)

 end match
 
 match /trunk/(COPYING|xvm-host-setup-notes)
 end match
 
 match /trunk/(COPYING|xvm-host-setup-notes)