X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=b4fe0cbf6b24577a5acd90f909461cb245795b48;hb=b5332638ab5f8887bf69bc457f06c17c68e45ce2;hp=68643caa8e330c35a9c475948eb1d229a953cb10;hpb=7da9437981df055fe8adc8c3732ed57ce4b53a4a;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 68643caa..b4fe0cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,98 @@
-dgit (6.2~) 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 (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.
+  * 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
+
+  * git-debrebase(1): Fix typo "unappled".  Closes:#905064.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 02 Aug 2018 08:24:32 +0100
+
+dgit (6.3) unstable; urgency=medium
+
+  * git-debrebase: breakwater: Fix error message for unprocessable
+    commits.  Closes:#905003.
+  * git-debrebase: new-upstream: Fix error message for new version
+    with bad syntax.
+  * git-debrebase test suite: Test messages about unprocessable commits.
+  * git-debrebase: new-upstream: Fix handling of epochs.
+  * git-debrebase: convert-from-gbp: Use same algorithm for finding
+    upstream commitish as new-upstream.  Closes:#905062.
+  * git-debrebase: Improve error messages for bad options.
+  * git-debrebase: Improve error message for convert-from-gbp
+    upstream discrepancy.  Closes:#905078.
+  * git-debrebase(5): Add ILLEGAL OPERATIONS section.  (Re#905004.)
+  * git-debrebase(1): Warn against plain git rebase.  (Re#905004.)
+  * dgit-maint-debrebase(7): Warn more against plain git rebase.
+    Closes:#905004.
+  * git-debrebase: Implement --help, providing a summary.
+    Closes:#904990.
+
+ -- Ian Jackson <ian@zealot.relativity.greenend.org.uk>  Thu, 02 Aug 2018 03:45:40 +0100
+
+dgit (6.2) unstable; urgency=medium
 
   * dgit(1): Improve and correct --build-products-dir description.
   * dgit: Minor code cleanup.
@@ -11,8 +105,9 @@ dgit (6.2~) unstable; urgency=medium
   * dgit-maint-gbp(7): discuss dgit.default.build-products-dir
   * dgit-maint-gbp(7): update references to --*-dirty
   * dgit-sponsorship(7): add references to push-source
+  * dgit-maint-debrebase(7): fix command to just launder
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 29 Jul 2018 12:57:26 +0100
 
 dgit (6.1) unstable; urgency=medium