Comment 5 for bug 407684

Revision history for this message
Tim Penhey (thumper) wrote : Re: [Bug 407684] Re: Launchpad by mistake marks branches as merged

On Wed, 19 Aug 2009 01:53:48 Aaron Bentley wrote:
> Tim Penhey wrote:
> > We should change the check to see if the tip is in the ancestry
> > but not the history (the history is the mainline of the branch), as this
> > would be able to determine that the branch was the same as trunk at some
> > stage, and hence not really "merged".
>
> However, this will break in the case where the branch is "merged" by
> pushing it into trunk.

Yes. I don't think we are going to get it right absolutely every time.

Perhaps it is better to err on the side of not marking something merged when
it is rather than marking something merged that isn't.