From 85a6971be95584a2a0ee418c04a1739a246e16d6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Aug 2018 10:44:22 +0100 Subject: changelog: Start 6.7 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 31cc533..b5a7192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.7~) unstable; urgency=medium + + * + + -- + dgit (6.6) unstable; urgency=medium * test suite: Fix gdr's calls to dgit when run formally in -- cgit v1.2.3 From 9145241120781f5274cbccd8359d38d209a83dca Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2018 15:26:09 +0100 Subject: git-debrebase: Improve ffq head recording message Say `recorded _previous_ head' rather than `current head'. Since by the time the message appears, it's the previous head. In particular, `current' is very confusing if there were previous progress messages. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index b5a7192..63d6f20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (6.7~) unstable; urgency=medium - * + * git-debrebase: Improve ffq head recording message. -- -- cgit v1.2.3 From ea212c7ae3fabab519aefe16cbc24a8911be134f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 10:58:16 +0100 Subject: git-debrebase: Set $debugcmd_when_debuglevel = 2 This produces much better (less noisy) debug output. git-debrebase calls subcommands an awful lot and they are generally very uninteresting. If this now turns out to be insufficient, we will add additional calls to printdebug. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 63d6f20..325d37f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (6.7~) unstable; urgency=medium * git-debrebase: Improve ffq head recording message. + * git-debrebase: Better (less copious by default) debug output. -- -- cgit v1.2.3 From 8c4cbc9eafaff67f8029512a0b5e710fb5278390 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 16:56:36 +0100 Subject: git-debrebase: Do not bail making patches if there aren't any. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 325d37f..2b75575 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ dgit (6.7~) unstable; urgency=medium * 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. -- -- cgit v1.2.3 From 066a68f06bfb3f17b31ff7244e21a00ddd6d48bb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 17:30:04 +0100 Subject: test suite: Set DEBFULLNAME Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 2b75575..cfc7b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dgit (6.7~) unstable; urgency=medium * 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 -- -- cgit v1.2.3 From 97b08388e773fb6c89817f583ea75dd0098f988a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 21:59:53 +0100 Subject: git-debrebase: scrap works properly when it does only rebase --abort We use @deferred_updates to see if we actually did anything for --noop-ok purposes. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index cfc7b5c..28b4811 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ dgit (6.7~) unstable; urgency=medium * 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. -- -- cgit v1.2.3 From 67a6338276dd0d5d81e3fff493a00dbc83e270b6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 12:26:56 +0100 Subject: dgit(1): Encourage --overwrite rather than --overwrite=version. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 28b4811..f076965 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dgit (6.7~) unstable; urgency=medium * 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. -- -- cgit v1.2.3 From 40239ebd30018360ab82a1651dd11e2e700410b4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 15:56:15 +0100 Subject: test suite: unset GIT_EDITOR, so it works if user has that set. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index f076965..f678131 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dgit (6.7~) unstable; urgency=medium * 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. -- -- cgit v1.2.3 From e64f34c55170943aa35bb806700c8ba3e99c50a7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 16:44:56 +0100 Subject: git-debrebase: Actually avoid read-tree in walk when not rewriting See git-debrebase: Prep for avoid read-tree in walk when not rewriting for the motivation. Here we try to check that the commit we would make, if we were actually calling read-tree, write-tree and hash-object, would be identical to the one we are reusing. In particular, we check that the upstream files, and the debian/ directory, have the contents we would feed to read-tree. And we check that the parent list is the same. With these checks this new algorithm is, I think, safe enough to just use always. So set $opt_careful to 0. We will abolish this variable in a moment. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index f678131..58b934e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ dgit (6.7~) unstable; urgency=medium * 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. Closes:#905995. -- -- cgit v1.2.3 From 5d8dfa9c2c0be56eaf85d7ce60ed38182878babd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 17:49:17 +0100 Subject: git-debrebase: Rewrite get_differs in terms of trees_diff_walk As noted, git-diff-tree is quite slow. We can do much better, by stepping across the two trees ourselves. There should be no particularly significant change: the answers should be the same for reasonable inputs. Unreasonable inputs (particularly, executable files etc.) may be handled better, even. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 58b934e..40a880e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ dgit (6.7~) unstable; urgency=medium * 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. Closes:#905995. + * git-debrebase: Improve analysis performance. -- -- cgit v1.2.3 From 76b47400a06d576939c8b010cdec1c506714e780 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 18:04:24 +0100 Subject: changelog: Add perf numbers This is from tests on my laptop with the branch the Debian kernel folks shared with me, ie c6eb63c6ed0694b0d22fbe5aaff953d209a3fc4e. avoid new runtimes in [s] before read-tree get_differs git-debrebase 78.574 3.699 1.419 git-debrebase status 3.359 unchanged 0.818 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 40a880e..e9a36a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,8 @@ dgit (6.7~) unstable; urgency=medium * 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. Closes:#905995. - * git-debrebase: Improve analysis performance. + * git-debrebase: Improve laundry performance by a factor of ~55:1, + and analysis performance by factor of ~4.2:1. Closes:#905995. -- -- cgit v1.2.3 From e66c2cf3f7182a3e6f52945636a807ed4a959d5b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 18:41:40 +0100 Subject: git-debrebase: `prepush' is now a silent no-op if unstitched. This is more friendly. Update the docs accordingly. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index e9a36a2..9ec8a6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ dgit (6.7~) unstable; urgency=medium * test suite: unset GIT_EDITOR, so it works if user has that set. * git-debrebase: 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 + unstitched. This is more friendly. -- -- cgit v1.2.3 From 96768306c386add902ee7a8b733225e9d811b971 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 18:45:51 +0100 Subject: git-debrebase: On rebase, always save ffq-prev Even if we were both stitched and laundered. Closes:#905975. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 9ec8a6f..5fe6904 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ dgit (6.7~) unstable; urgency=medium and analysis performance by factor of ~4.2:1. Closes:#905995. * git-debrebase: `prepush' 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. -- -- cgit v1.2.3 From 6152f859fc4fa61b485362a6ff5613f436883db8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 19:18:42 +0100 Subject: git-debrebase: convert-from-*: Snag on unused patches Patches in d/patches which are not in series will be deleted, and not represented in the output. So call them a snag. Closes:#904997. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 5fe6904..3f18752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ dgit (6.7~) unstable; urgency=medium 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. -- -- cgit v1.2.3 From b63c713ba91eaab799d24329fbbdb912c20f9846 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 19:26:34 +0100 Subject: changelog: Add close note for #905400 to changelog entry for 6.5. The commit git-debrebase: Properly reject bare dgit dsc imports. fixed #905400. Signed-off-by: Ian Jackson --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 3f18752..18bb180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ dgit (6.7~) unstable; urgency=medium 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. -- @@ -33,7 +34,7 @@ dgit (6.5) unstable; urgency=medium * git-debrebase: New subcommand `scrap'. Closes:#905063. git-debrebase error handling improvements: - * git-debrebase: Properly reject bare dgit dsc imports + * 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. -- cgit v1.2.3 From dea27c626d6c39d11a1b591005fd2e6e2a17e295 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:19:54 +0100 Subject: changelog: Document changes to convert-from-gbp messages. This is part of #906641. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 18bb180..98c0383 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ dgit (6.7~) unstable; urgency=medium * 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. -- -- cgit v1.2.3 From 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:44:29 +0100 Subject: git-debrebase: Merges: Enable with command-line option instead of env var Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 98c0383..614a576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ dgit (6.7~) unstable; urgency=medium 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. -- -- cgit v1.2.3 From 8f28dfa084b6d63e385d7fe538214eee2f90ea9e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 23:25:48 +0100 Subject: git-debrebase: Snag on repeated conversions If debrebase-last says we are ahead of some previous gdr work, it is carrying on is unlikely to be helpful. It would only be sensible if the package is vacillating between branch formats, and this is reflected and visible in the branch history. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 614a576..3ac55a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ dgit (6.7~) unstable; urgency=medium * 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. -- -- cgit v1.2.3 From 625ef9cc461653073175be47c4b6a2a9e25c13d1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 23:38:09 +0100 Subject: git-debrebase: convert-from-*: leave debrebase-last refs To hint to everyone that this is now a gdr branch. This will make dgit push use gdr make-patches, for example. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 3ac55a0..058ce00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ dgit (6.7~) unstable; urgency=medium 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. -- -- cgit v1.2.3 From d82657683a77446101a644dec66fd0b83d18bf95 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 00:24:18 +0100 Subject: git-debrebase: Provide hints for unprocessable commits Depending on the apparent branch ffq state. Closes:#905005. In particular, if it doesn't look like this branch was ever used with gdr, suggest that the user is on the wrong branch, or needs to use convert-from-*. Closes:#905279. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 058ce00..3fe4ea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,9 @@ dgit (6.7~) unstable; urgency=medium 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. -- -- cgit v1.2.3 From b5332638ab5f8887bf69bc457f06c17c68e45ce2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 01:24:34 +0100 Subject: dgit(7): Mention bad origs as possible cause of quilt fixup failure And document our error message changes. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 3fe4ea8..b4fe0cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ dgit (6.7~) unstable; urgency=medium * 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, + in both dgit(7) and in error messages. No longer suggest + --quilt=smash or dpkg-source --commit in the error message. + Closes:906196. -- -- cgit v1.2.3 From 1bc7acac1e13f58de74e7e07b0f3c3741f4ef405 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 01:42:47 +0100 Subject: dgit: quilt fixup: Do not suggest quilt modes if we see gdr If `stopped at' is a git-debrebase commit, then a non-default quilt mode is probably not the answer. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index b4fe0cb..a370753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ dgit (6.7~) unstable; urgency=medium 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" + a commit made by git-debrebase. Closes:#906197. -- -- cgit v1.2.3 From a88577467219f6813799d41cc80ae32c176cd8a5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 01:58:06 +0100 Subject: dgit(1), dgit(7): Document that we do not suppress export attributes Ie, ones which affect git-archive. This is related to #906199. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index a370753..0d38ee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ dgit (6.7~) unstable; urgency=medium Closes:906196. * dgit: 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. -- -- cgit v1.2.3 From b8effc17a1aadcfdf3524157555a8656cc94369f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 01:59:08 +0100 Subject: dgit: quilt fixup: Maybe mention gitattributes These are a potential cause of quilt linearisation failure. Closes:#906199. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 0d38ee7..c17232f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ dgit (6.7~) unstable; urgency=medium 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. -- -- cgit v1.2.3 From 52b97bd1b16a5db0b3b58e4864b5fdd6fc5e2689 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 02:08:12 +0100 Subject: changelog: Reorganise and tidy up the current entry Signed-off-by: Ian Jackson --- debian/changelog | 74 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 30 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index c17232f..f33d3be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,41 +1,55 @@ dgit (6.7~) unstable; urgency=medium - * 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, + 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. -- -- cgit v1.2.3 From 17164daffe9910cf9b1574316b181986769837ce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 02:30:17 +0100 Subject: changelog: Finalise 6.7 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index f33d3be..a292f59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (6.7~) unstable; urgency=medium +dgit (6.7) unstable; urgency=medium git-debrebase, bugfixes: * make-patches: Do not bail if there aren't any. @@ -51,7 +51,7 @@ dgit (6.7~) unstable; urgency=medium 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 -- cgit v1.2.3 From d8fe7d0a89ee7dd6531508bb0813588f867b245f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 02:35:08 +0100 Subject: changelog: start 6.8 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index a292f59..68348f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.8~) unstable; urgency=medium + + * + + -- + dgit (6.7) unstable; urgency=medium git-debrebase, bugfixes: -- cgit v1.2.3 From 04c1349ee97a40bcf44a5636f72811c33eae0ef7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 14:52:22 +0100 Subject: test suite: Fix dependencies of new gdr-merge-conflicts test. Signed-off-by: Ian Jackson --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 68348f8..37be210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -dgit (6.8~) unstable; urgency=medium +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 -- cgit v1.2.3 From ebfc4c43791dc67d5f5b22aca654b8a1ab54f394 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Aug 2018 14:53:48 +0100 Subject: changelog: start 6.9 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 37be210..8711080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.9~) unstable; urgency=medium + + * + + -- + dgit (6.8) unstable; urgency=medium * test suite: Fix dependencies of new gdr-merge-conflicts test. -- cgit v1.2.3 From 6f3e3449c7f62594e48df4f5851b08b7366fb5dc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Aug 2018 02:08:39 +0100 Subject: dgit: do not crash on push of a new gdr package. Closes:#906784. Signed-off-by: Ian Jackson --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 8711080..29ff56e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dgit (6.9~) unstable; urgency=medium - * + * dgit: do not crash on push of a new gdr package. Closes:#906784. -- -- cgit v1.2.3 From 1da1a2b176cb726e3e076ccb7f38f1e676430b18 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Aug 2018 13:33:04 +0100 Subject: test suite: Update debian/tests/control following dependency fix. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 29ff56e..aff9bc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ dgit (6.9~) unstable; urgency=medium * dgit: do not crash on push of a new gdr package. Closes:#906784. + * test suite: Update debian/tests/control following dependency fix. -- -- cgit v1.2.3 From adb0dd0b2ac3a1602c2fe1e39ba241c53eff5324 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Aug 2018 13:31:12 +0100 Subject: changelog: Document docs changes Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index aff9bc3..cfd8e76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ dgit (6.9~) unstable; urgency=medium * dgit: do not crash on push of a new gdr package. Closes:#906784. + * 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. -- -- cgit v1.2.3 From c0b9db3fad908bcf3b02a5179fbd2288f3d44a4d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Aug 2018 13:40:31 +0100 Subject: dgit: Remove unsubstituted $changesfile from message Closes:#906787. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index cfd8e76..50ee0b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ 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 ] -- cgit v1.2.3 From cb65a902d2d9b9869ec64324d61549320e04d523 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Aug 2018 14:36:41 +0100 Subject: changelog: fianlise 6.9 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 50ee0b3..f625b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (6.9~) unstable; urgency=medium +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. @@ -7,7 +7,7 @@ dgit (6.9~) unstable; urgency=medium 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 -- cgit v1.2.3 From 5e3b368807710c9bb083404efefccb271b852619 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 21 Aug 2018 14:40:36 +0100 Subject: changelog: start 6.10 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index f625b00..8f22168 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.10~) unstable; urgency=medium + + * + + -- + dgit (6.9) unstable; urgency=medium * dgit: do not crash on push of a new gdr package. Closes:#906784. -- cgit v1.2.3 From b4c4528ff740265a4da91f758ebb23e0852475b3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 17:56:43 +0100 Subject: changelog: Run gbp-dch Needs tidying up. Signed-off-by: Ian Jackson --- debian/changelog | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 8f22168..259aaa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,80 @@ 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 -- -- cgit v1.2.3 From 491e27a03c4c673e24eea7c29088f3d12e5e36a2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 18:11:40 +0100 Subject: changelog: Tidy up, preparatory to release Signed-off-by: Ian Jackson --- debian/changelog | 116 +++++++++++++++++++++---------------------------------- 1 file changed, 44 insertions(+), 72 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 259aaa1..a766e8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,80 +1,52 @@ 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 bugfixes: + * Patches in subdirectories: fix malfunctions. Closes:#907202,#907206. + * new-upstream changelog entry: Use debchange. Closes:#905888. + * Empty patch queues: Fix some malfunctions and infelicities. + * convert-to-gbp: Actually base the result on the breakwater, not HEAD. + + dgit bugfixes: + * *build*: Cope with new-style --build= specifications + * Pass --no-source to sbuild (always). Closes:#904966. + * build: Squash $buildproductsdir. Closes:#906786. + + dgit improvements for git-debrebase compatibility: + * Do not try split brain git-debrebase make-patches. Closes:#906908. + * Do not abandon quilt fixup at git-debrebase split commits. + * Check for git-debrebase with a history walker, not debrebase-last. + This can avoids using dpkg-source --commit. Closes:#907208. + + git-debrebase improvements: + * convert-from-*: snag on discarding comments in series. Closes:#907198. + * forget-was-ever-debrebase: New subcommand. + * Make all commit message annotations have a COMMIT-TYPE. + + git-debrebase documentation: + * dgit-maint-debrebase(7): Add runes for inspecting. Closes:#907190. * 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 + + test suite behavioural changes for ad-hoc runs: + * run-all: Without --progressive, rm and recreate tests/tmp + * run-all: Honour DGIT_TESTS_TMPDIR + * run-all: Understand `:' specially + + test suite: + * Tests for the bugfixes and improvements. + * lib-gdr: Be more defensive about unexpected states/args + * lib-gdr: Check that we made patches with git-debrebase + * Honour DGIT_TEST_RUN_PFX env var. + * Test dgit calling git-debrebase on new debianisation. + * gdr-new-upstream: Check changelog is exactly right. + * debchange: Widespread better handling of the time seen by dch. + Freeze time. Work around faketime TZ bug (#907264). + * 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 + * build-modes-*: Provide stunt dpkg-deb to pass -Znone, for speed. + * build-products-dir: Check nothing in ../ + * Work if $tmp is on a different filesystem. + * Internal changes and refactoring to support other changes. -- -- cgit v1.2.3 From c728f91e7a0563fe6c76653a22badd09b62fc30f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 26 Aug 2018 14:58:24 +0100 Subject: changelog: finalise 6.10 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index a766e8f..999c29e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (6.10~) unstable; urgency=medium +dgit (6.10) unstable; urgency=medium git-debrebase bugfixes: * Patches in subdirectories: fix malfunctions. Closes:#907202,#907206. @@ -48,7 +48,7 @@ dgit (6.10~) unstable; urgency=medium * Work if $tmp is on a different filesystem. * Internal changes and refactoring to support other changes. - -- + -- Ian Jackson Sun, 26 Aug 2018 14:58:18 +0100 dgit (6.9) unstable; urgency=medium -- cgit v1.2.3 From 8ce73fba51859cce9d37cbaed08429f261f37e72 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 26 Aug 2018 14:59:37 +0100 Subject: changelog: start 6.11 Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 999c29e..3376f0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (6.11~) unstable; urgency=medium + + * + + -- Ian Jackson Sun, 26 Aug 2018 14:59:32 +0100 + dgit (6.10) unstable; urgency=medium git-debrebase bugfixes: -- cgit v1.2.3 From 80660b109ae671e5164c6738919f34db06719236 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 26 Aug 2018 21:57:22 +0100 Subject: changelog: Documentation changes and finalise 6.11 Signed-off-by: Ian Jackson --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 3376f0a..e152a3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -dgit (6.11~) unstable; urgency=medium +dgit (6.11) unstable; urgency=medium - * + * dgit-maint-debrebase(7): move and improve the section + "Inspecting the history". [Sean Whitton] + * Makefile: Adjust scope of dgit(7) pod rule. + * local-pod-man: developer script, obsoleteed by `make %.view': drop it. -- Ian Jackson Sun, 26 Aug 2018 14:59:32 +0100 -- cgit v1.2.3