Package branch merges not automatically detected

Reported by Barry Warsaw on 2011-01-13
18
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Launchpad itself
High
Unassigned

Bug Description

When I fix a bug in Ubuntu, I create a branch of the source package, fix the bug, push a branch, and propose a merge. When a sponsor uploads the modified package, the linked bug gets properly Fixed Released, and the merge proposal gets properly Merged, but the branch remains in the Development status.

As an example:

bug:

https://bugs.launchpad.net/ubuntu/+source/python-numpy/+bug/685469

branch:

https://code.launchpad.net/~barry/ubuntu/natty/python-numpy/685469-crash

merge proposal:

https://code.launchpad.net/~barry/ubuntu/natty/python-numpy/685469-crash/+merge/43986

I have to manually tweak the status of the branch to Merged. I'll leave the above branch in Development though so you can debug it (well, at least for a while :).

Robert Collins (lifeless) wrote :

I'm not sure how this is /meant/ to work... Tim / Aaron - do you know ?

Changed in launchpad:
status: New → Incomplete
Artem Popov (artfwo) wrote :

After it's merged, a branch is supposed to become "Merged" in the listings: https://code.launchpad.net/people/+me. I've stumbled upon this bug yesterday. Setting the status to "Confirmed" to keep it from closing automatically.

Changed in launchpad:
status: Incomplete → Confirmed

On Tue, Mar 1, 2011 at 3:10 PM, Артём Попов <email address hidden> wrote:
> After it's merged, a branch is supposed to become "Merged" in the
> listings: https://code.launchpad.net/people/+me. I've stumbled upon this
> bug yesterday. Setting the status to "Confirmed" to keep it from closing
> automatically.

If they don't commit the merge to the target branch - and uploading is
not the same as committing - then its not clear that this is what
should happen.

OK... found the issue, and it is hanging over from the package branch original days.

The scanner detects merges of proposals, and will mark the branch as merged if the target of the proposal is a series branch.

However, is_series_branch currently says (in lib/lp/codehosting/scanner/mergedetection.py):
def is_series_branch(branch):
    """Is 'branch' associated with a series?"""
    # XXX: JonathanLange 2009-05-07 spec=package-branches: This assumes that
    # we only care about whether a branch is a product series. What about poor
    # old distroseries?
    return branch.associatedProductSeries().count() > 0

The method should be updated to also check the branch.associatedSuiteSourcePackages()

tags: added: branch-scanner
Changed in launchpad:
importance: Undecided → Medium
Changed in launchpad:
status: Confirmed → Triaged
importance: Medium → High
tags: added: easy
William Grant (wgrant) on 2011-09-30
summary: - Merged branches keep 'Development' status when their merge proposal is
- marked as 'Merged'
+ Package branch merges not automatically detected
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers