From 52b97bd1b16a5db0b3b58e4864b5fdd6fc5e2689 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 02:08:12 +0100 Subject: [PATCH] changelog: Reorganise and tidy up the current entry Signed-off-by: Ian Jackson --- debian/changelog | 74 ++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index c17232fc..f33d3be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,41 +1,55 @@ 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, + git-debrebase, bugfixes: + * make-patches: Do not bail if there aren't any. + * scrap: works properly when it does only rebase --abort. + * On rebase: always save ffq-prev even if we were both stitched and + laundered. Closes:#905975. + + git-debrebase, improvements: + * Speed: 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 + * prepush: this 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, + * convert-from-*: Snag on patches in d/patches which are not in series, + because they will be deleted. Closes:#904997. + * Highly experimental merge resolution support, enabled only with + special command line option. + * Lots of internal changes to support merge, and other work. + * convert-from-*: Check whether ffq-prev or debrebase-last indicate that + we are already in gdr format. + * convert-from-*: leave debrebase-last refs to hint to everyone that + this is now a gdr branch. + + git-debrebase, improved messages: + * Improve ffq head recording message. + * Better (less copious by default) debug output. + * convert-from-gbp: Improve messages. Closes:#906641. + * Provide hints for unprocessable commits, depending on the apparent + branch ffq state, including possible suggestion to use convert-from-*. + Closes:#905005. Closes:#905279. + + dgit, improved messages: + * 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" + * Do not suggest --quilt modes if quilt fixup "stopped at" a commit made by git-debrebase. Closes:#906197. - * dgit(1), dgit(7): Document that we do not suppress attributes - which affect git-archive. This is related to #906199. - * dgit: Mention gitattributes as a potential problem in quilt - linearisation failure, when appropriate. Closes:#906199. + * Mention gitattributes as a potential problem in quilt linearisation + failure, when appropriate. Closes:#906199. + + dgit, documentation: + * dgit(1): Encourage --overwrite rather than --overwrite=version. + * Document that we do not suppress attributes which affect git-archive. + This is related to #906199. + + test suite: + * test suite: Set DEBFULLNAME + * test suite: unset GIT_EDITOR, so it works if user has that set. + + Packaging: + * changelog: Add close note for #905400 to changelog entry for 6.5. -- -- 2.30.2