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(1), dgit(7): Document that we do not suppress attributes
+ which affect git-archive. This is related to #906199.
--
* 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.