dgit: Better error message if non-split-brain patch stack no longer applies

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e128e1e79dfaa2b72780507fd9a9da4a5505f9d7..f8363904204aad47572cd87300f32fb66380e36e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ dgit (1.5~~) unstable; urgency=medium
   * New tag format (for dgit view) archive/debian/VERSION.
   * Before committing to push, check that .dsc and .changes correspond.
     Closes:#800060.
+  * Better error message if non-split-brain patch stack no longer
+    applies (due to new upstream version, or user messing with it).
+    Closes:#833025.
 
   Infrastructure:
   * Better error handling in dgit-repos-policy-debian.
@@ -53,6 +56,9 @@ dgit (1.5~~) unstable; urgency=medium
   Documentation:
   * Document the dgit-distro.DISTRO.quilt-mode config setting.
   * Clarify the --clean= options' documentation.  Closes:#800054.
+  * Discourage use of the --PROGRAM:OPTION escape hatch.  (Apropos
+    of various bug reports including #800060 and #833025.)
+  * Document the expected form of HEAD for each --quilt= mode.
 
   Bugfixes:
   * When cleaning up after failed clone, stat the to-be-cleaned-up