X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=0078bf26959e50c56f6e73fabb4f9951d74e451a;hp=0f36987bda9b081fa6694d8875c945dc394ebc79;hb=6f3e3449c7f62594e48df4f5851b08b7366fb5dc;hpb=a0e481f58a8d70a2a87d59e3e3eda0c32f4c99d2 diff --git a/debian/changelog b/debian/changelog index 0f36987b..29ff56e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,292 @@ -dgit (5.5+exp2) experimental; urgency=medium +dgit (6.9~) unstable; urgency=medium + + * dgit: do not crash on push of a new gdr package. Closes:#906784. + + -- + +dgit (6.8) unstable; urgency=medium + + * test suite: Fix dependencies of new gdr-merge-conflicts test. + + -- Ian Jackson Mon, 20 Aug 2018 14:52:03 +0100 + +dgit (6.7) unstable; urgency=medium + + git-debrebase, bugfixes: + * make-patches: Do not bail if there aren't any. + * scrap: works properly when it does only rebase --abort. + * On rebase: always save ffq-prev even if we were both stitched and + laundered. Closes:#905975. + + git-debrebase, improvements: + * Speed: improve laundry performance by a factor of ~55:1, + and analysis performance by factor of ~4.2:1. Closes:#905995. + * prepush: this is now a silent no-op if the branch is + unstitched. This is more friendly. + * convert-from-*: Snag on patches in d/patches which are not in series, + because they will be deleted. Closes:#904997. + * Highly experimental merge resolution support, enabled only with + special command line option. + * Lots of internal changes to support merge, and other work. + * convert-from-*: Check whether ffq-prev or debrebase-last indicate that + we are already in gdr format. + * convert-from-*: leave debrebase-last refs to hint to everyone that + this is now a gdr branch. + + git-debrebase, improved messages: + * Improve ffq head recording message. + * Better (less copious by default) debug output. + * convert-from-gbp: Improve messages. Closes:#906641. + * Provide hints for unprocessable commits, depending on the apparent + branch ffq state, including possible suggestion to use convert-from-*. + Closes:#905005. Closes:#905279. + + dgit, improved messages: + * Mention bad origs as possible cause of quilt fixup failure, + in both dgit(7) and in error messages. No longer suggest + --quilt=smash or dpkg-source --commit in the error message. + Closes:906196. + * Do not suggest --quilt modes if quilt fixup "stopped at" + a commit made by git-debrebase. Closes:#906197. + * Mention gitattributes as a potential problem in quilt linearisation + failure, when appropriate. Closes:#906199. + + dgit, documentation: + * dgit(1): Encourage --overwrite rather than --overwrite=version. + * Document that we do not suppress attributes which affect git-archive. + This is related to #906199. - * test suite: Explicit agent starting/stopping + test suite: + * test suite: Set DEBFULLNAME + * test suite: unset GIT_EDITOR, so it works if user has that set. + + Packaging: + * changelog: Add close note for #905400 to changelog entry for 6.5. + + -- Ian Jackson Mon, 20 Aug 2018 02:30:06 +0100 + +dgit (6.6) unstable; urgency=medium + + * test suite: Fix gdr's calls to dgit when run formally in + autopkgtest. (Affects gdr-import-dgitview.) + + -- Ian Jackson Sun, 05 Aug 2018 10:42:01 +0100 + +dgit (6.5) unstable; urgency=medium + + git-debrebase new features: + * git-debrebase: Provide new convert-from-dgit-view operation. + The output is, unavoidably, not very pretty. Closes:#905322. + * git-debrebase: New subcommand `scrap'. Closes:#905063. + + git-debrebase error handling improvements: + * git-debrebase: Properly reject bare dgit dsc imports. Closes:905400. + * git-debrebase: Improve some error message formatting. + * git-debrebase: Check for git-rebase in progress and abort most operations. + + dgit improvements: + * dgit: Improve error message for unknown suite, to suggest -d. + * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias. + * dgit: Provide print-unapplied-treeish subcommand. + + Test suite changes: + * test suite: Add t-tstunt-parsechangelog to many gdr tests. + * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE. + * test suite: gdr-import-dgitview: New test for dgit dsc imports. + + -- Ian Jackson Sat, 04 Aug 2018 17:53:57 +0100 - -- Ian Jackson Thu, 28 Jun 2018 00:42:00 +0100 +dgit (6.4) unstable; urgency=medium + + * git-debrebase(1): Fix typo "unappled". Closes:#905064. + + -- Ian Jackson Thu, 02 Aug 2018 08:24:32 +0100 + +dgit (6.3) unstable; urgency=medium + + * git-debrebase: breakwater: Fix error message for unprocessable + commits. Closes:#905003. + * git-debrebase: new-upstream: Fix error message for new version + with bad syntax. + * git-debrebase test suite: Test messages about unprocessable commits. + * git-debrebase: new-upstream: Fix handling of epochs. + * git-debrebase: convert-from-gbp: Use same algorithm for finding + upstream commitish as new-upstream. Closes:#905062. + * git-debrebase: Improve error messages for bad options. + * git-debrebase: Improve error message for convert-from-gbp + upstream discrepancy. Closes:#905078. + * git-debrebase(5): Add ILLEGAL OPERATIONS section. (Re#905004.) + * git-debrebase(1): Warn against plain git rebase. (Re#905004.) + * dgit-maint-debrebase(7): Warn more against plain git rebase. + Closes:#905004. + * git-debrebase: Implement --help, providing a summary. + Closes:#904990. + + -- Ian Jackson Thu, 02 Aug 2018 03:45:40 +0100 + +dgit (6.2) unstable; urgency=medium + + * dgit(1): Improve and correct --build-products-dir description. + * dgit: Minor code cleanup. + * dgit build: Warn if --build-products-dir is not `..'. Closes:#904859. + * test suite: Test dgit import-dsc --build-products-dir. + + [Sean Whitton] + * manpages: alioth->salsa + * manpages: add references to pbuilder and cowbuilder + * dgit-maint-gbp(7): discuss dgit.default.build-products-dir + * dgit-maint-gbp(7): update references to --*-dirty + * dgit-sponsorship(7): add references to push-source + * dgit-maint-debrebase(7): fix command to just launder + + -- Ian Jackson Sun, 29 Jul 2018 12:57:26 +0100 + +dgit (6.1) unstable; urgency=medium + + New feature: + * 'pbuilder' and 'cowbuilder' subcommands (Closes: #844125). + - Suggest sbuild | pbuilder | cowbuilder. + + Minor fixes: + * Fix an error message to refer to the build products dir instead of + just the parent directory. + + -- Sean Whitton Sat, 28 Jul 2018 20:14:23 +0800 + +dgit (6.0) unstable; urgency=medium + + New features [Sean Whitton]: + * Introduce dgit.default.build-products-dir git configuration key. + Closes:#857316. + * Die earlier, and with a more helpful message, if the user tries to + include dirty changes when building a source package in split brain + mode. + + dgit behavioural changes: + * dgit: Always build the source package ourselves, rather than + sometimes leaving that to the builder command. dgit will now + usually generate *_multi.changes rather than *_$arch.changes. + * dgit: Build source packages in a private directory, except when + the user passes --include-dirty [Sean Whitton]. + - dgit push-source no longer cleans the tree [Sean Whitton]. + * dgit: Rename --ignore-dirty to --include-dirty (leaving the old + name supported as a deprecated alias). + + Test suite improvements: + * test suite: unset VISUAL, which interferes. Closes:#904308. + * Honour DGIT_SCHROOT_CHROOT to set the schroot to use for the sbuild + tests. + * Support tests/run-all --progressive. + * Drop now-obsolete *-asplit tests. + + Other improvements: + * apt-get method: when apt does not update release files, + unconditionally print hint about noatime. Closes:#851873. + * messages: Be a lot more friendly about NEW in particular, + and also add a couple of `please's. Closes:#904448. + * Make --build-products-dir (and the new config key) actually work. + Closes:#863582. [ Ian and Sean. ] + * dgit: Many important internal rearrangemnts relating to source + package production and building. + + -- Ian Jackson Thu, 26 Jul 2018 14:43:47 +0100 + +dgit (5.10) unstable; urgency=medium + + * Merge the experimental branch. + * test suite: Drop a couple of useless test log output lines. + * infrastructure: Run git gc --auto before mirroring. Closes:#841414. + + -- Ian Jackson Sat, 14 Jul 2018 18:07:02 +0100 + +dgit (5.9+exp4) experimental; urgency=medium + + * test suite: Use dch -r -D sid '' not dch -r sid. Closes:#903441. + * test suite: Save a tarball of much of the working area of each test + in $AUTOPKGTEST_ARTIFACTS. + * Separate changelog entries for the following test attempts + in experimental have been elided: + dgit (5.9+exp3) experimental; urgency=medium + dgit (5.9+exp2) experimental; urgency=medium + dgit (5.9+exp1) experimental; urgency=medium + + -- Ian Jackson Thu, 12 Jul 2018 13:45:07 +0100 + +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: + * 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 @@ -11,12 +295,6 @@ dgit (5.5) unstable; urgency=medium -- Ian Jackson Thu, 28 Jun 2018 13:25:21 +0100 -dgit (5.4+exp1) experimental; urgency=medium - - * No-change upload, for testing. - - -- Ian Jackson Thu, 28 Jun 2018 00:44:52 +0100 - dgit (5.4) unstable; urgency=medium Improvements: