-dgit (5.0~) unstable; urgency=low
+dgit (6.9~) unstable; urgency=medium
- Major new utility:
- * git-debrebase, a new git workflow tool.
+ * 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 <ijackson@chiark.greenend.org.uk> 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:
+ * 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> Sat, 04 Aug 2018 17:53:57 +0100
+
+dgit (6.4) unstable; urgency=medium
+
+ * git-debrebase(1): Fix typo "unappled". Closes:#905064.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> 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 <ian@zealot.relativity.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <spwhitton@spwhitton.name> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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 <ijackson@chiark.greenend.org.uk> 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.
* Break git_get_symref and $extra_orig_namepart_re out into Dgit.pm.
* Changes to support git-debrebase.
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 18 Jun 2018 00:29:44 +0100
dgit (4.4) unstable; urgency=high
~ianmdlvl / dgit.git / blobdiff