merge finish misses removing ":" from an LP bug
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-ubuntu |
New
|
Undecided
|
Unassigned |
Bug Description
I have this series of commits applied on top of new/debian. I abbreviated the text a bit for clarity. Please observe the three commits that I highlighted which have LP bug references and are all part of a "drop" section:
commit 796af0741bbecc2
- d/p/CVE-
commit 2162b4bb6d3da0a
- d/p/CVE-
commit f589bbb8f5622b3
- d/control, d/rules: add json support for the statistics channels.
(LP: #1669193)
commit ebbc87a504757a2
* Drop:
- rules: Fix path to libsofthsm2.so. (LP: #1685780)
commit 7772ca09166f633
- Add RemainAfterExit to bind9-resolvconf unit configuration file
(LP: #1536181).
commit abbc90262a20671
(...)
When I run merge finish pkg/ubuntu/devel, this is the changelog that it produces:
* Merge with Debian unstable. Remaining changes:
- Add RemainAfterExit to bind9-resolvconf unit configuration file
(LP #1536181).
* Drop:
- rules: Fix path to libsofthsm2.so. (LP: #1685780)
[adopted in 1:9.10.6+dfsg-5]
- d/control, d/rules: add json support for the statistics channels.
(LP #1669193)
[adopted in 1:9.10.6+dfsg-5]
- d/p/CVE-
regression (RT #44318) introduced with the CVE-2016-8864.patch
and fixed in CVE-2016-
[applied upstream]
- d/p/CVE-
introduced with the CVE-2016-8864.patch and fixed in
CVE-
[applied upstream]
It correctly removed the ":" from the LP bugs in all but the "Fix path to libsofthsm2" entry.
Ah funny, it's because we think it's a top-level entry, which we don't
modify :) I'll give it a think.
On Thu, Jan 25, 2018 at 5:44 AM, Andreas Hasenack <email address hidden> wrote: 594893f0c017a64 863bed6e0c (HEAD, tag: before- merge-finish) 2016-8864- regression- test.patch: tests for the regression 63ea445ad0f09ba a2b5932444 2016-8864- regression2- test.patch: tests for the second 0060e5158b06915 02cb5549f4 <-- WATCH b9fbb61c7f4e31e 8fcb5f32ed <-- WATCH 6143f0b31dbe7a4 0f975edcfc <-- WATCH 4e8f7dbd061c5ef 4a87df4173 (tag: pkg/import/ 1%9.11. 2+dfsg- 5, tag: new/debian, tag: import/ 1%9.11. 2+dfsg- 5, pkg/debian/sid, pkg/debian/buster, debian/sid) 2016-8864- regression2- test.patch: tests for the second 8864-regression 2.patch. 2016-8864- regression- test.patch: tests for the regression 8864-regression .patch. /bugs.launchpad .net/bugs/ 1745374 /bugs.launchpad .net/usd- importer/ +bug/1745374/ +subscriptions
> Public bug reported:
>
> I have this series of commits applied on top of new/debian. I
> abbreviated the text a bit for clarity. Please observe the three commits
> that I highlighted which have LP bug references and are all part of a
> "drop" section:
>
> commit 796af0741bbecc2
> - d/p/CVE-
>
> commit 2162b4bb6d3da0a
> - d/p/CVE-
>
> commit f589bbb8f5622b3
> - d/control, d/rules: add json support for the statistics channels.
> (LP: #1669193)
>
> commit ebbc87a504757a2
> * Drop:
> - rules: Fix path to libsofthsm2.so. (LP: #1685780)
>
> commit 7772ca09166f633
> - Add RemainAfterExit to bind9-resolvconf unit configuration file
> (LP: #1536181).
>
> commit abbc90262a20671
> (...)
>
> When I run merge finish pkg/ubuntu/devel, this is the changelog that it produces:
> * Merge with Debian unstable. Remaining changes:
> - Add RemainAfterExit to bind9-resolvconf unit configuration file
> (LP #1536181).
> * Drop:
> - rules: Fix path to libsofthsm2.so. (LP: #1685780)
> [adopted in 1:9.10.6+dfsg-5]
> - d/control, d/rules: add json support for the statistics channels.
> (LP #1669193)
> [adopted in 1:9.10.6+dfsg-5]
> - d/p/CVE-
> regression (RT #44318) introduced with the CVE-2016-8864.patch
> and fixed in CVE-2016-
> [applied upstream]
> - d/p/CVE-
> introduced with the CVE-2016-8864.patch and fixed in
> CVE-2016-
> [applied upstream]
>
> It correctly removed the ":" from the LP bugs in all but the "Fix path
> to libsofthsm2" entry.
>
> ** Affects: usd-importer
> Importance: Undecided
> Status: New
>
> --
> You received this bug notification because you are a member of Ubuntu
> Server Dev import team, which is subscribed to usd-importer.
> https:/
>
> Title:
> merge finish misses removing ":" from an LP bug
>
> To manage notifications about this bug go to:
> https:/