From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 30 Jun 2018 21:40:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'dgit/dgit/experimental'
X-Git-Tag: archive/debian/5.6~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a300724a321a26770ccf701e0a638c7bfa93fa5c;p=dgit.git

Merge remote-tracking branch 'dgit/dgit/experimental'

Conflicts:
	debian/changelog

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

a300724a321a26770ccf701e0a638c7bfa93fa5c
diff --cc debian/changelog
index 3b551ec9,852adc76..92287200
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,52 +1,28 @@@
 -dgit (5.5+exp9) experimental; urgency=medium
 -
 -  * test suite: gpg agent workaround: Fix bugs in log neatening.
 -
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100
 -
 -dgit (5.5+exp8) experimental; urgency=medium
 -
 -  * test suite: gpg agent workaround: Neaten the logging.
 -
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 10:54:48 +0100
 -
 -dgit (5.5+exp7) experimental; urgency=medium
 -
 -  * test suite: gpg-agent workaround: Send ps output to stderr (oops)
 -
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 17:03:09 +0100
 -
 -dgit (5.5+exp6) experimental; urgency=medium
 -
 -  * test suite: gpg-agent workaround: Cope if ps not found.
 +dgit (5.6~) unstable; urgency=medium
  
-   * 
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 13:02:30 +0100
++  * Merge the experimental branch containing the fianl
++    version of the test suite gnupg workarounds.
  
 -dgit (5.5+exp5) experimental; urgency=medium
 + --
  
 -  * test suite: gpg-agent workaround: Add more debugging output.
 -  * test suite: gpg-agent workaround: Kill unexpected leftover agents.
 -
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 12:22:23 +0100
 -
 -dgit (5.5+exp4) experimental; urgency=medium
 -
 -  * test suite: Add bc to appropriate test Depends.
 -
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 29 Jun 2018 00:46:11 +0100
 -
 -dgit (5.5+exp3) experimental; urgency=medium
 -
 -  * Bump changelog entry date.
 -
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 16:31:35 +0100
++dgit (5.5+exp9) experimental; urgency=medium
+ 
 -dgit (5.5+exp2) experimental; urgency=medium
++  * test suite: Explicitly start/stop the gnupg agent, around
++    each call to gnupg.  Apropos of #902316 (and #868550).
+ 
 -  * test suite: Explicit agent starting/stopping
++  * Separate changelog entries for the following test attempts
++    in experimental have been elided:
++      dgit (5.5+exp8) experimental; urgency=medium
++      dgit (5.5+exp7) experimental; urgency=medium
++      dgit (5.5+exp6) experimental; urgency=medium
++      dgit (5.5+exp5) experimental; urgency=medium
++      dgit (5.5+exp4) experimental; urgency=medium
++      dgit (5.5+exp3) experimental; urgency=medium
++      dgit (5.5+exp2) experimental; urgency=medium
++      dgit (5.4+exp1) experimental; urgency=medium
+ 
 - -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 00:42:00 +0100
++ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100
+ 
  dgit (5.5) unstable; urgency=medium
  
    * Add missing comma in debian/control.  Closes:#902578.