X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=a370753de38f8ce247d6cf42eb2dfa3d299ebfa8;hp=4ea57ef27f9625c155ffa18e00d1299a1ecd2371;hb=1bc7acac1e13f58de74e7e07b0f3c3741f4ef405;hpb=12948968b9a6e48898a5a704a524930da170cd75

diff --git a/debian/changelog b/debian/changelog
index 4ea57ef2..a370753d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,70 @@
-dgit (6.5~) unstable; urgency=medium
+dgit (6.7~) unstable; urgency=medium
+
+  * git-debrebase: Improve ffq head recording message.
+  * git-debrebase: Better (less copious by default) debug output.
+  * git-debrebase: Do not bail making patches if there aren't any.
+  * test suite: Set DEBFULLNAME
+  * git-debrebase: scrap works properly when it does only rebase --abort.
+  * dgit(1): Encourage --overwrite rather than --overwrite=version.
+  * test suite: unset GIT_EDITOR, so it works if user has that set.
+  * git-debrebase: Improve laundry performance by a factor of ~55:1,
+    and analysis performance by factor of ~4.2:1.  Closes:#905995.
+  * git-debrebase: `prepush' is now a silent no-op if the branch is
+    unstitched.  This is more friendly.
+  * git-debrebase: On rebase, always save ffq-prev even if we were
+    both stitched and laundered.  Closes:#905975.
+  * git-debrebase: convert-from-*: Snag on patches in d/patches which are
+    not in series, because they will be deleted.  Closes:#904997.
+  * changelog: Add close note for #905400 to changelog entry for 6.5.
+  * git-debrebase: convert-from-gbp: Improve messages.  Closes:#906641.
+  * git-debrebase: Highly experimental merge resolution support,
+    enabled only with special command line option.
+  * git-debrebase: Check in convert-from-* whether ffq-prev or
+    debrebase-last indicate that we are already in gdr format.
+  * git-debrebase: convert-from-*: leave debrebase-last refs to
+    hint to everyone that this is now a gdr branch.
+  * git-debrebase: Provide hints for unprocessable commits, depending
+    on the apparent branch ffq state, including possible suggestion
+    to use convert-from-*.  Closes:#905005.  Closes:#905279.
+  * dgit: Mention bad origs as possible cause of quilt fixup failure,
+    in both dgit(7) and in error messages.  No longer suggest
+    --quilt=smash or dpkg-source --commit in the error message.
+    Closes:906196.
+  * dgit: Do not suggest --quilt modes if quilt fixup "stopped at"
+    a commit made by git-debrebase.  Closes:#906197.
 
+ --
+
+dgit (6.6) unstable; urgency=medium
+
+  * test suite: Fix gdr's calls to dgit when run formally in
+    autopkgtest.  (Affects gdr-import-dgitview.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 Aug 2018 10:42:01 +0100
+
+dgit (6.5) unstable; urgency=medium
+
+  git-debrebase new features:
+  * git-debrebase: Provide new convert-from-dgit-view operation.
+    The output is, unavoidably, not very pretty.  Closes:#905322.
+  * git-debrebase: New subcommand `scrap'.  Closes:#905063.
+
+  git-debrebase error handling improvements:
+  * git-debrebase: Properly reject bare dgit dsc imports.  Closes:905400.
+  * git-debrebase: Improve some error message formatting.
+  * git-debrebase: Check for git-rebase in progress and abort most operations.
+
+  dgit improvements:
+  * dgit: Improve error message for unknown suite, to suggest -d.
+  * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.
+  * dgit: Provide print-unapplied-treeish subcommand.
+
+  Test suite changes:
   * test suite: Add t-tstunt-parsechangelog to many gdr tests.
   * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.
-  * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.
+  * test suite: gdr-import-dgitview: New test for dgit dsc imports.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 04 Aug 2018 17:53:57 +0100
 
 dgit (6.4) unstable; urgency=medium