From 17ee7a97dfc83fe49ba58ceaf2d7836df18761a6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 27 Jul 2015 16:59:03 +0100
Subject: [PATCH 1/1] README.update

---
 README.infra-update => README.update | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
 rename README.infra-update => README.update (58%)

diff --git a/README.infra-update b/README.update
similarity index 58%
rename from README.infra-update
rename to README.update
index bd31f23..d535a09 100644
--- a/README.infra-update
+++ b/README.update
@@ -2,24 +2,31 @@
  # get right tree in git on zealot and make it pass all tests
  # push to inbound branches
      git push gideon +HEAD:t
-     git push dgit-cgi +HEAD+t
- # do upload of dgit-test-dummy
-     dch -v1.12 -Dexperimental 'For testing infrastructure'
+     git push cgi +HEAD:t
+ # prepare upload of dgit-test-dummy
+     XX dch -v1.12 -Dexperimental 'For testing infrastructure'
      debcommit -a
      dgit -wgf build
+ # actually update infra on gideon and dgit-cgi
+     cd /srv/dgit.debian.org/dgit-live
+     git merge --ff-only t
+ # do test push
      dgit --deliberately-include-questionable-history push experimental
  # check that tree is visible with
-     dgit fetch
      curl https://git.dgit.debian.org/dgit-test-dummy/info/refs
+     dgit fetch experimental
+ # fetch into zealot
+     git fetch -p gideon
+     git fetch -p cgi
 
 #### package upload
  # get right tree in git on zealot and make it pass all tests
  # push to chiark master
  # finalise changelog (including suite and urgency) and commit
  # build
-     PERLLIB=. ./dgit -wgf build
+     PERLLIB=. ./dgit -wgf sbuild -c build
  # install
-     dpkg -i ../dgit_BLAH_all.deb
+     XX dpkg -i ../dgit_BLAH_all.deb
  # push
      dgit -wgf push
  # push to chiark master
-- 
2.30.2