From 9664cff6eadf376e1b4f418a080bdcc5ff12a563 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Wed, 12 Apr 2017 13:54:58 +0200 Subject: Document changes and release 0.8.14 --- debian/NEWS | 2 +- debian/changelog | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/debian/NEWS b/debian/NEWS index 63f38294..304944a3 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -git-buildpackage (0.8.14) unstable; urgency=medium +git-buildpackage (0.8.14) experimental; urgency=medium gbp import-orig's --merge-mode option now defaults to 'auto' selecting 'replace' for 3.0 (quilt) packages and 'merge' otherwise. If you want to diff --git a/debian/changelog b/debian/changelog index 1dd6e3f6..55b96eda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +git-buildpackage (0.8.14) experimental; urgency=medium + + * [fe821e2] GitRepository: use stdout as last resort if stderr is empty. + This e.g. gives: + GitRepositoryError: Error running git commit: On branch master + Untracked files: + debian/ + nothing added to commit but untracked files present + Instead of + GitRepositoryError: Error running git commit: + * [1dd290a] pq: unbreak --commit when patch series becomes empty. We + skipped the commit when the patch series became completely empty but we + want to commit that change too. + * [75bf793] posttag-push: Use named parameter for dry_run + * [844e4f8] import-orig: only abort merge if it got started. + This isn't be the case when there are e.g. files that would be overwritten + by the merge in the workig copy (Closes: #859439) + * [3b70ad2] GitRepository: add is_in_merge() + * [5d414c1] buildpackage: cleaner does not default to debuild since ages + (Closes: #859594) + * [e890ce3] ipmort_orig: pick best way to import upstream tarball + automatically. Add new value --merge-mode=auto that selects either + 'replace' or 'merge' depending on the source format version. + (Closes: #700411) + + -- Guido Günther Wed, 12 Apr 2017 13:53:52 +0200 + git-buildpackage (0.8.13) experimental; urgency=medium [ Guido Günther ] -- cgit v1.2.3