Test suite: import-nonnative: Enhanced and finished

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ee5f7d0b5b56748199a6ae383f22ecac7e685669..3cd6e8e6cc5965fdd42c25cd773fcd84e2348ee1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ dgit (1.5~~) unstable; urgency=medium
     in the toplevel the same way we treat ones in the toplevel.
   * When automatically generating quilt patch, honour GIT_COMMITTER_DATE
     for filename creation (makes filename deterministic in test suite).
+  * New --overwrite option, replaces need to for user to use
+    git merge -s ours.  Closes:#838718.
 
   Infrastructure:
   * Better error handling in dgit-repos-policy-debian.
@@ -48,6 +50,16 @@ dgit (1.5~~) unstable; urgency=medium
     source.  Fixes bad Perl poetry syntax.  Closes:#829121.
   * When synthesing a commit from a .dsc from the archive, stop
     internal git reset from printing a confusing message about HEAD.
+  * Turn off git gc in the private working areas.
+  * Do not fail to do some important quilt processing in some
+    --quilt modes.
+  * Fix two calls to chdir without proper error checking.
+  * Fix a couple of bugs in error reporting.
+  * Fix up .orig detection to be less trustful of (ambiguous) filenames.
+  * Fix up .orig detection to correctly allow exactly the right
+    .orig-comp components accorging to dpkg-source(1).
+  * Fix up .orig detection to handle .asc's (and other signatures)
+    of .orig components the same way as their tarballs.
 
   Test suite:
   * When sbuild fails, do not crash due to sed not finding the log