merge finish misses removing ":" from an LP bug

Bug #1745374 reported by Andreas Hasenack
6
This bug affects 1 person
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 796af0741bbecc2594893f0c017a64863bed6e0c (HEAD, tag: before-merge-finish)
        - d/p/CVE-2016-8864-regression-test.patch: tests for the regression

commit 2162b4bb6d3da0a63ea445ad0f09baa2b5932444
        - d/p/CVE-2016-8864-regression2-test.patch: tests for the second

commit f589bbb8f5622b30060e5158b0691502cb5549f4 <-- WATCH
        - d/control, d/rules: add json support for the statistics channels.
          (LP: #1669193)

commit ebbc87a504757a2b9fbb61c7f4e31e8fcb5f32ed <-- WATCH
      * Drop:
        - rules: Fix path to libsofthsm2.so. (LP: #1685780)

commit 7772ca09166f6336143f0b31dbe7a40f975edcfc <-- WATCH
        - Add RemainAfterExit to bind9-resolvconf unit configuration file
          (LP: #1536181).

commit abbc90262a206714e8f7dbd061c5ef4a87df4173 (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)
(...)

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-2016-8864-regression2-test.patch: tests for the second
      regression (RT #44318) introduced with the CVE-2016-8864.patch
      and fixed in CVE-2016-8864-regression2.patch.
      [applied upstream]
    - d/p/CVE-2016-8864-regression-test.patch: tests for the regression
      introduced with the CVE-2016-8864.patch and fixed in
      CVE-2016-8864-regression.patch.
      [applied upstream]

It correctly removed the ":" from the LP bugs in all but the "Fix path to libsofthsm2" entry.

Tags: merge
Revision history for this message
Nish Aravamudan (nacc) wrote : Re: [Bug 1745374] [NEW] merge finish misses removing ":" from an LP bug

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:
> 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 796af0741bbecc2594893f0c017a64863bed6e0c (HEAD, tag: before-merge-finish)
> - d/p/CVE-2016-8864-regression-test.patch: tests for the regression
>
> commit 2162b4bb6d3da0a63ea445ad0f09baa2b5932444
> - d/p/CVE-2016-8864-regression2-test.patch: tests for the second
>
> commit f589bbb8f5622b30060e5158b0691502cb5549f4 <-- WATCH
> - d/control, d/rules: add json support for the statistics channels.
> (LP: #1669193)
>
> commit ebbc87a504757a2b9fbb61c7f4e31e8fcb5f32ed <-- WATCH
> * Drop:
> - rules: Fix path to libsofthsm2.so. (LP: #1685780)
>
> commit 7772ca09166f6336143f0b31dbe7a40f975edcfc <-- WATCH
> - Add RemainAfterExit to bind9-resolvconf unit configuration file
> (LP: #1536181).
>
> commit abbc90262a206714e8f7dbd061c5ef4a87df4173 (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)
> (...)
>
> 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-2016-8864-regression2-test.patch: tests for the second
> regression (RT #44318) introduced with the CVE-2016-8864.patch
> and fixed in CVE-2016-8864-regression2.patch.
> [applied upstream]
> - d/p/CVE-2016-8864-regression-test.patch: tests for the regression
> introduced with the CVE-2016-8864.patch and fixed in
> CVE-2016-8864-regression.patch.
> [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://bugs.launchpad.net/bugs/1745374
>
> Title:
> merge finish misses removing ":" from an LP bug
>
> To manage notifications about this bug go to:
> https://bugs.launchpad.net/usd-importer/+bug/1745374/+subscriptions

Robie Basak (racb)
tags: added: merge
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.