X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=a370753de38f8ce247d6cf42eb2dfa3d299ebfa8;hp=f678131df99851d293480e5a1b9c7d5d28ce71cd;hb=1bc7acac1e13f58de74e7e07b0f3c3741f4ef405;hpb=40239ebd30018360ab82a1651dd11e2e700410b4 diff --git a/debian/changelog b/debian/changelog index f678131d..a370753d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,31 @@ dgit (6.7~) unstable; urgency=medium * 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. -- @@ -25,7 +50,7 @@ dgit (6.5) unstable; urgency=medium * git-debrebase: New subcommand `scrap'. Closes:#905063. git-debrebase error handling improvements: - * git-debrebase: Properly reject bare dgit dsc imports + * 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.