X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=f8363904204aad47572cd87300f32fb66380e36e;hb=afee8943fd120d9f99b3a5890cf2625e12815f5d;hp=4bc6df0d7585f0f66e16953aa9c62ec4469371f4;hpb=fc7f55f032e31ef0d7376deef3d47d333d8259e5;p=dgit.git diff --git a/debian/changelog b/debian/changelog index 4bc6df0d..f8363904 100644 --- 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. @@ -54,7 +57,7 @@ dgit (1.5~~) unstable; urgency=medium * 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.) + of various bug reports including #800060 and #833025.) * Document the expected form of HEAD for each --quilt= mode. Bugfixes: