X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=59ca50ce264b442be6fcceadc5da089687ff24bf;hp=b0fbb920243c3666542c04834bc69da786006626;hb=7e0281c1c8db9139b501650fcdca7a778001c7ad;hpb=bc95a2402f9e765113ef38d12d642a3340132049 diff --git a/debian/changelog b/debian/changelog index b0fbb920..59ca50ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,21 +1,209 @@ -dgit (4.5~) unstable; urgency=medium +dgit (5.9) unstable; urgency=medium + + * git-debrebase convert-from-gbp: Look for dgit-generated tags so we can + usually make the new branch ff of the dgit view. Closes:#903132. + * git-debrebase convert-from-gbp: Check that the result will not + count as having diverged. This will usually turn failures to make + the ff pseudomerge into -fdiverged. Related to #903132. + * git-debrebase, Dgit.pm, git: some internal reorganisation to + support git-debrebase changes. + * dgit-downstream-dsc(7): New manpage. Closes:#842643,#851194. + * git-debrebase(5): Document best gitk options. Closes:#901927. + + -- Ian Jackson Thu, 12 Jul 2018 13:37:12 +0100 + +dgit (5.8) unstable; urgency=medium + + Bugfixes: + * dgit, git-debrebase: Properly make patches even if an awkward + .gitignore ignores the things in debian/patches. Closes:#903130. + * git-debrebase status: Fix commit reporting. Closes:903131. + * git-debrebase new-upstream: Add a -1 revision if the user + didn't supply one. Closes:#903127. + * git-debrebase: Improve grammar if one blocking snag. + * dgit(1): Unscramble push[-source] descriptions. Closes:#903116. + + -- Ian Jackson Sun, 08 Jul 2018 11:42:41 +0100 + +dgit (5.7) unstable; urgency=medium + + New feature: + * dgit checkout: new subcommand. Closes:#878443. + * dgit: Check that entirely-new uploads to Debian are not + source-only-uploads, as those are REJECTed. Closes:#801435. Bugfixes: - * Fix the exit status of programs in dgit.deb, to avoid the - Perl misfeature which sometimes copies $! to the exit status. + * dgit(7): Mention git-debrebase and gbp pq alongside git-dpm, + in the comment about handling patch stacks. + * dgit update-vcs-git: Honour --package properly. + * test suite: Always pass LC_COLLATE=C to sort(1). Closes:#903006. + * test suite: Fix trustingpolicy-replay & dput-ng. Closes:#903007. + * test suite: Test dput-ng compatibility. + + -- Ian Jackson Thu, 05 Jul 2018 15:02:21 +0100 + +dgit (5.6) unstable; urgency=medium + + * Merge the experimental branch containing the fianl + version of the test suite gnupg workarounds. Empirically, + - The tests now pass (most of the time, at least) in + current Debian unstable, whereas 5.5's fail utterly. + - There is still occasional lossage. So when running tests + in a loop (eg to test ever commit), it is still good to set + DGIT_TEST_RETRY_COUNT=3 (say). + + * test suite: Test that manpages format with only expected warnings. + + -- Ian Jackson Sun, 01 Jul 2018 00:41:20 +0100 + +dgit (5.5+exp9) experimental; urgency=medium + + * test suite: Explicitly start/stop the gnupg agent, around + each call to gnupg. Apropos of #902316 (and #868550). + + * Separate changelog entries for the following test attempts + in experimental have been elided: + dgit (5.5+exp8) experimental; urgency=medium + dgit (5.5+exp7) experimental; urgency=medium + dgit (5.5+exp6) experimental; urgency=medium + dgit (5.5+exp5) experimental; urgency=medium + dgit (5.5+exp4) experimental; urgency=medium + dgit (5.5+exp3) experimental; urgency=medium + dgit (5.5+exp2) experimental; urgency=medium + dgit (5.4+exp1) experimental; urgency=medium + + -- Ian Jackson Sat, 30 Jun 2018 19:03:00 +0100 + +dgit (5.5) unstable; urgency=medium + + * Add missing comma in debian/control. Closes:#902578. + * dgit(1): Fix a wrong reference to \fp, which should be \fP. + + -- Ian Jackson Thu, 28 Jun 2018 13:25:21 +0100 + +dgit (5.4) unstable; urgency=medium + + Improvements: + * dgit(1): Better description of --overwrite. Somewhat + apropos of discussion in #902534. + + Bugfixes: + * test suite: gdr-viagit, gdr-newupstream: Do not spuriously + fail if gnupg not serendipitously installed. Closes:#902559. + * Fix bug ref to #865444 in previous changelog entry. + + -- Ian Jackson Wed, 27 Jun 2018 23:13:42 +0100 + +dgit (5.3) unstable; urgency=medium + + Bugfixes: + * dgit: Do not introduce duplicate origs in .changes files, + eg if the .changes already has that orig. Closes:#869146. + * Honour GIT_REFLOG_ACTION everywhere. Closes:#901935. + * git-debrebase new-upstream: Provide better reflog entries + by setting GIT_REFLOG_ACTION. Closes:#901925. + + Improvements: + * Better message formatting when --overwrite may be needed, + and a note about first dgit push in dgit(1). Closes:891031. + * dgit(7): Add discussion of quilt fixup error messages, + and add cross-references to dgit(1) and the actual error. + Somewhat apropos of #865444. + + -- Ian Jackson Wed, 27 Jun 2018 14:00:31 +0100 + +dgit (5.2) unstable; urgency=medium + + dgit bugfixes: + * When all Debian changes vanish with single-debian-patch, + do not fail to commit the patch queue removal. Closes:#877036. + * When build fails because the network is offline, mention + that this is because --since-version was not specified. + Closes:#883340. + * When quilt fixup fails because of discrepancies, print a + git diff rune which will show them. Closes:#865446. + * When fetch or push wants git fetch (other than in a situation where it + happes to be a noop) but --dry-run was specified, fail with an + explanation, rather than looping with a false coplaint about git + fetch. Closes:#871317. + * --overwrite now no longer crashes if there is nothing to overwrite + (eg, when used with --new). Instead, it is simply ignored, as it is + ignored in situations where the push is fast forward. Closes:#863576. + + dgit/git-debrebase interop bugfixes: + * git-debrebase interop: Add a missing debugcmd debugging print. + * git-debrebase interop: Actually tolerate git-debrebase make-patches + exiting with status 7. + + dgit vcs-git handling improvements: + * Provide `update-vcs-git' subcommand, for creating and adjusting the + vcs-git remote url. Useful for transition from alioth to salsa. + Closes:#902006. + * Print a warning to stderr on `dgit fetch sid', if your vcs-git + remote url disagrees with what's in sid's .dsc. + + documentation: + * dgit(1): Mention under `dgit build' that it uses the network. + * dgit(1): Clarify that --overwrite does nothing if not needed. + Closes:#863578. + * dgit-user(7): Recommend sbuild-debian-developer-setup. + [ Sean Whitton. ] Closes:895779. + + test suite: + * Use nproc(1) rather than Sys::CPU. This is more portable and does not + depend on libsys-cpu-perl being installed. Closes:888496. + + -- Ian Jackson Sun, 24 Jun 2018 23:33:28 +0100 + +dgit (5.1) unstable; urgency=medium + + dgit gitattributes handling: + * Squash the working-tree-encoding attribute too. + * Update an existing `dgit-defuse-attrs' macro in .git/info/attributes. + * Test the working-tree-encoding attribute squashing properly. + Closes:#901900. + + git-debrebase fixes: + * new-upstream: fix (this time for sure) ff check handling + of multi-piece upstreams. + * Suppress gbp pq export output, except in case of error. + Closes:#901809. + * Manpages: Fix typos and etc. + * Fix a typo in the package description. + + Test suite: + * Triger ci.debian.net autopkgtests on: gnupg diffutils patch. + (A dummy test is used to add to Testsuite-Triggers.) + + -- Ian Jackson Wed, 20 Jun 2018 23:20:57 +0100 + +dgit (5.0) unstable; urgency=low + + Major new facility: + * git-debrebase, a new git workflow tool, in its own package. + * dgit will now, when appropriate, check if it should call + git-debrebase. + + [ Thanks to Sean Whitton for much useful input, and for + dgit-maint-debrebase(7). ] + + dgit bugfixes: + * Fix the exit status of programs in dgit.deb, to avoid the Perl + misfeature which sometimes copies $! to the exit status. * When checking that the tree is clean, check the git index too. * In quilt_fixup_multipatch, work around git checkout paths not deleting files. (Hypothetical bug AFAIAA.) * Respect --quilt=nofix even if single-debian-patch. - Minor fixes: + dgit minor fixes: * "confess" when we die due to a warning, rather than symply dieing. Internal changes: * Move $playground global to dgit. * Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm. + * Changes to support git-debrebase. - -- + -- Ian Jackson Mon, 18 Jun 2018 00:29:44 +0100 dgit (4.4) unstable; urgency=high