In the git import, deal with r316, r318 and the corresponding tag by

hand instead of through s-a-f-e.

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

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index 1f977bd..389b769 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -22,6 +22,10 @@ sed -n 's/^create repository // p' ../rules | while read repo; do
     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

diff --git a/rules.mako b/rules.mako
index 55b394e..80f5931 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -65,11 +65,7 @@ end match
 match /package_tags/${package}/([^/~]+)/${package}/
   repository ${get_repo(package)}
   branch tags/${get_tag_prefix(package)}\1
-%     if package == 'sipb-xen-dev':
-  max revision 318
-%     else:
   max revision ${packages[package]['undouble'][0] - 1}
-%     endif
 end match
 
 match /trunk/packages/tmp/${package}/

diff --git a/svn.yml b/svn.yml
index 1b090f2..3496bd4 100644 (file)
--- a/svn.yml
+++ b/svn.yml
@@ -102,6 +102,7 @@ scripts:
 quashes:
 - {rev: 11, path: /package_tags/sipb-xen-dev/sipb-xen-dev/}
 - {rev: 316, path: /package_tags/sipb-xen-dev/13/}
+- {rev: 318, path: /package_tags/sipb-xen-dev/13/sipb-xen-dev/}
 - {rev: 347, path: /package_tags/sipb-xen-console/2/}
 - {rev: 348, path: /package_tags/sipb-xen-console/2/sipb-xen-console/}
 - {rev: 349, path: /package_tags/sipb-xen-console/2/}