Launchpad automatically marking branches as merged (was: Re: How do you remove a remote branch?)

[Jonathan Lange]

On Tue, May 5, 2009 at 8:06 AM, Matt Nordhoff
<mnordhoff at mattnordhoff.com> wrote:
> Michael Hudson wrote:
>> Matt Nordhoff wrote:
>>> For what it's worth, that's a nice feature of Launchpad: you can mark
>>> branches as merged or abandoned so they won't be displayed in the
>>> default listings but you don't have to delete them.
>>>
>>> E.g., look at the difference between these two pages:
>>>
>>> <https://code.edge.launchpad.net/bzr>
>>> <https://code.edge.launchpad.net/bzr?field.lifecycle=MERGED>
>>>
>>> (Of course, some people never do mark their branches as merged, so the
>>> listings get polluted anyway.)
>>
>> Launchpad _should_ mark branches as merged automatically.
>>
>> Cheers,
>> mwh
>
> So I've been told. Hmm, looking over the lists of branches for bzr,
> loggerhead and pytz, nothing jumps out at me that should be marked as
> merged.
>
> Well, except for lp:~mnordhoff/loggerhead/transport, which I just added
> shortly *after* merging it. And I swear I set it to Merged on the branch
> creation screen. Huh. (It's marked as merged /now/ because I just fixed it.)
>

We also have code that changes a branch from being merged to being in
development. After all, if you push a new revision to a branch that
has been merged, it's no longer merged.

It's entirely possible that there are glitches in this code.

> I swear I used to see a lot of branches that needed to be marked as
> merged, but I can't find any now. Maybe I was wrong in most cases, or
> maybe more recent LP changes have fixed it. I mean, this could've been
> six months ago. I dunno.

It's definitely possible.

I know of one existing problem area for the mark-as-merged code. If a
branch A has been merged into another non-trunk branch B, and then B
has been merged into trunk, B will be marked as merged but A will not.
We're still investigating this -- I haven't even got around to filing
a bug.

jml