Merge branch 'master' into wip.remote

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index fd85edce8cfe075f0efc7798824c063606b12c0e..f57b4acd78cd1028459476d2aa46c25517a9f8ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,53 @@
+dgit (0.18~experimental2) experimental; urgency=low
+
+  * Merge in accidentally-dropped changes from 0.17~experimental7.
+  * Merge bugfix from master (unstable/testing) branch.
+
+ --
+
+dgit (0.17) unstable; urgency=high
+
+  * Do not grobble around in .git/refs/; instead, use git-show-ref.
+    This avoids breaking when git makes packed refs.  Closes:728893.
+  * Clarify error message for missing refs/remotes/dgit/dgit/<suite>.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 07 Nov 2013 00:02:47 +0000
+
+dgit (0.18~experimental1) experimental; urgency=low
+
+  * No update to code.
+    dgit 0.17 is going to go into unstable soon, and we need to
+     (a) test it (so this is an upload for testing); and
+     (b) bump the version number in experimental to keep it here
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 06 Nov 2013 21:54:15 +0000
+
+dgit (0.17~experimental7) experimental; urgency=low
+
+  * manpage: Remove comment in BUGS about lack of policy docs
+    for Dgit field, which is specified now.  Closes:#720201.
+  * manpage: Make discussion of --existing-package less scary.  The
+    default archive access method no longer needs it.  Closes:#720171.
+
+ --
+
+dgit (0.17~experimental6) experimental; urgency=low
+
+  * No update to code.  Upload to remove "DO NOT USE" indication.
+    This one appears to work.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 25 Oct 2013 17:24:38 +0100
+
+dgit (0.17~experimental5) experimental; urgency=low
+
+  TEST PUSH DO NOT USE
+  * No update, just testing remote push.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 25 Oct 2013 17:21:52 +0100
+
 dgit (0.17~experimental4) experimental; urgency=low
 
+  * TEST PUSH DO NOT USE
   * dgit build, by default, uses the archive to find out what the correct
     -v<version> option is to pass to dpkg-genchanges.  Closes:#727200.
   * When using sbuild, pass the arguments to mergechanges in the right
@@ -14,8 +62,11 @@ dgit (0.17~experimental4) experimental; urgency=low
     not to have caused any real trouble in previous versions of dgit.
   * Retrospectively mention in changelog entry for 0.16~experimental2
     that it Closes:#727125.
+  * Mention "git merge", not "git-merge", in helpful message.
+    Closes:#725632.
+  * Remote push support seems to work.  Closes:#721185.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 25 Oct 2013 17:14:23 +0100
 
 dgit (0.17~experimental3) experimental; urgency=low