X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=259aaa1c112aae32ffcd3bd736c60c0f75f2074d;hb=b4c4528ff740265a4da91f758ebb23e0852475b3;hp=c17232fcd5b53c6966d37c23b683939bdf546074;hpb=b8effc17a1aadcfdf3524157555a8656cc94369f;p=dgit.git diff --git a/debian/changelog b/debian/changelog index c17232fc..259aaa1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,43 +1,154 @@ -dgit (6.7~) unstable; urgency=medium +dgit (6.10~) unstable; urgency=medium + + * changelog: start 6.10 + * git-debrebase: trees_diff_walk: Refactor $all to \%opts + * git-debrebase: Fix get_tree's memoisation wrt $recurse (Closes: #907202) + * git-debrebase: trees_diff_walk: Support recursion + * git-debrebase: classify: Do not misclassify patches in subdirs + (Closes: #907206) + * test suite: Make example_1.1 contain a patch with Name and Topic + * git-debrebase: convert-from-*: snag on discarding comments in series + (Closes: #907198) + * test suite: gdr-import-nostitch: Test -fseries-comments + * git-debrebase: forget-was-ever-debrebase: New subcommand + * git-debrebase: test suite: gdr-subcommands: test forget + * git-debrebase: Do not try split brain gdr make-patches (Closes: #906908) + * git-debrebase(5): Warn against renaming branch while unstitched + * test-suite: lib-gdr: Be more defensive about unexpected states/args + * test suite: lib-gdr: Check that we made patches with gdr + * git-debrebase: Make all commit annotations have a COMMIT-TYPE + * git-debrebase: Do not abandon quilt fixup at gdr split commits + * dgit: Introduce get_tree_of_commit + * test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches + * dgit: Replace branch_is_gdr with a history walker (Closes: #907208) + * test suite: Honour DGIT_TEST_RUN_PFX env var + * test suite: gdr-diverge-nmu-dgit: Insist on gdr-generated patches + * test suite: Test dgit detection of fresh branch for gdr make-patches + * test suite: Test dgit branch_is_gdr walker on a merge resolution + * test suite: Separate t-gdr-gbp-import-core from -with-queue + * dgit: branch_is_gdr: Put gdr commit annotations in alphabetical order + * git-debrebase: gbp_pq_export: Return flag, are there any patches? + * git-debrebase: make_patches_staged: Return flag, are there any patches? + * git-debrebase: convert-to-gbp: Actually start from breakwater + * git-debrebase: convert-to-gbp: Handle no-patches case better + * git-debrebase: keycommits: Fix doc comment + * git-debrebase: make-patches: Handle case when there are no patches + * git-debrebse: merge handling: Handle absence of patches via $any + * test suite: Test dgit calling git-debrebase on new debianisation + * dgit: branch_is_gdr: Add a cautionary comment + * git-debrebase(5): Document new understanding of debrebase-last + * test suite: gdr-fresh: Drop use of git-deborig and fix dependencies + * test suite: test-list-uptodate: Drop imports and dependencies + * git-debrebase: gdr-merge-conflicts: Call git merge --no-edit + * test suite: gdr-new-upstream: Check changelog is exactly right + * test suite: Provide tstunt/debchange + * git-debrebase: Prepare for calling debchange + * test suite: gdr-newupstream: Add more dividers + * test suite: gdr-new-upstream: Use new branch rather than reset + * test suite: gdr-new-upstream: Break out clog-check-[12] + * test suite: dch: Always use tstunt/debchange + * test suite: debchange: Freeze time + * test suite: debchange: Work around faketime TZ bug + * test suite: Update date to one with nontrivial DST in Europe/London + * git-debrebase: Use debchange for new-upstream changelog entry + (Closes: #905888) + * test suite: gdr-new-upstream: Test updating existing clog entry + * dgit-maint-debrebase(7): Add runes for inspecting history (Closes: #907190) + * test suite: lib-gdr: Factor out t-make-orig + * git-debrebase: t-make-orig: Pass -1 to gzip + * test suite: gdr-fresh: use t-make-orig + * test suite: gdr-makepatches7: use t-make-orig + * test suite: Work if $tmp is on a different filesystem. + * test suite: run-all: Without --progressive, rm and recreate tests/tmp + * test suite: run-all: Honour DGIT_TESTS_TMPDIR + * test suite: run-all: Move setting of TESTSCRIPTS + * test suite: run-all: Understand `:' specially + * gdr-fresh: Honour $bpd + * test suite: sbuild-gitish: Do not use build-products-dir + * test suite: build-products-dir: Check nothing in ../ + * test suite: break out build-modes-source + * dgit: build: Squash $buildproductsdir (Closes: #906786) + * test suite: Test dgit build with bpd + * test suite: tstunt debchange: Use exec + * test suite: build-modes-*: Provide stunt dpkg-deb to pass -Znone + * dgit: build-*: Cope with new-style --build= specifications + * test suite: Test dgit build --build= + * dgit: Pass --no-source to sbuild (always) (Closes: #904966) + * changelog: Run gbp-dch - * git-debrebase: Improve ffq head recording message. - * git-debrebase: Better (less copious by default) debug output. - * git-debrebase: Do not bail making patches if there aren't any. - * test suite: Set DEBFULLNAME - * git-debrebase: scrap works properly when it does only rebase --abort. - * dgit(1): Encourage --overwrite rather than --overwrite=version. - * test suite: unset GIT_EDITOR, so it works if user has that set. - * git-debrebase: Improve laundry performance by a factor of ~55:1, + -- + +dgit (6.9) unstable; urgency=medium + + * dgit: do not crash on push of a new gdr package. Closes:#906784. + * dgit: Remove unsubstituted $changesfile from message Closes:906787. + * dgit-maint-debrebase(7): improve "Converting an existing package", + and refer to "ILLEGAL OPERATIONS" in git-debrebase(5). + Closes:#905573. [ Sean Whitton ] + * test suite: Update debian/tests/control following dependency fix. + + -- Ian Jackson Tue, 21 Aug 2018 14:36:36 +0100 + +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. - * git-debrebase: `prepush' is now a silent no-op if the branch is + * prepush: this is now a silent no-op if the branch is unstitched. This is more friendly. - * git-debrebase: On rebase, always save ffq-prev even if we were - both stitched and laundered. Closes:#905975. - * git-debrebase: convert-from-*: Snag on patches in d/patches which are - not in series, because they will be deleted. Closes:#904997. - * changelog: Add close note for #905400 to changelog entry for 6.5. - * git-debrebase: convert-from-gbp: Improve messages. Closes:#906641. - * git-debrebase: Highly experimental merge resolution support, - enabled only with special command line option. - * git-debrebase: Check in convert-from-* whether ffq-prev or - debrebase-last indicate that we are already in gdr format. - * git-debrebase: convert-from-*: leave debrebase-last refs to - hint to everyone that this is now a gdr branch. - * git-debrebase: Provide hints for unprocessable commits, depending - on the apparent branch ffq state, including possible suggestion - to use convert-from-*. Closes:#905005. Closes:#905279. - * dgit: Mention bad origs as possible cause of quilt fixup failure, + * 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. - * dgit: Do not suggest --quilt modes if quilt fixup "stopped at" + * Do not suggest --quilt modes if quilt fixup "stopped at" a commit made by git-debrebase. Closes:#906197. - * dgit(1), dgit(7): Document that we do not suppress attributes - which affect git-archive. This is related to #906199. - * dgit: Mention gitattributes as a potential problem in quilt - linearisation failure, when appropriate. Closes:#906199. + * 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: + * 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