X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/451f031e1e5fdaadfc1bfb2c385cc9583660290e..ae40d6536d2e42e5255d1a10f5477aa57ddf5116:/rules.mako

diff --git a/rules.mako b/rules.mako
index 0557dd3..e6bb325 100644
--- a/rules.mako
+++ b/rules.mako
@@ -26,7 +26,7 @@
             return packages[package]['branch']
         if 'merge' in packages[package]:
             return get_branch(packages[package]['merge'])
-        return 'master'
+        return 'prod'
 
     def get_tag_prefix(package):
         if 'merge' in packages[package]:
@@ -66,7 +66,8 @@ end match
 
 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
 
@@ -92,9 +93,15 @@ match /trunk/packages/${package}/
 %   endif
 end match
 
+match /package_branches/${package}/([^/~]+)/
+  repository ${get_repo(package)}
+  branch ${get_tag_prefix(package)}\1
+end match
+
 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]}
 %   endif
@@ -102,7 +109,8 @@ end match
 
 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]}
 %   endif
@@ -174,7 +182,8 @@ end match
 
 match /third_tags/${t}/([^/~]+)/
   repository third/${t}.git
-  branch tags/\1
+  branch refs/tags/\1
+  annotated true
 end match
 % endfor