Rearrange the git configuration slightly:

 - List "pockets" instead of "branches" to divorce our pockets from
   git branches specifically.
 - Each pocket can have a "git" and/or "apt" attribute. Both default
   to the name of the pocket if unspecified.
 - Add an allow_backtracking field, which indicates whether
   non-fast-forwards are allowed and whether version numbers have to
   be monotonically increasing.

svn path=/trunk/packages/xvm-prodconfig/; revision=2514

diff --git a/master.yaml b/master.yaml
index cc564a7..165b28a 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -46,13 +46,14 @@ dns:
   - /etc/invirt/zone
 
 git:
- branches:
+ pockets:
   prod:
    acl: *adminacl
-   component: stable
+   apt: stable
   dev:
    acl: system:xvm-dev
-   component: unstable
+   apt: unstable
+   allow_backtracking: yes
  tagger:
   name: Invirt Build Server
   email: invirt@mit.edu