Merged branches not marked as merged

[Jean-Paul Calderone]

I merged <lp:~game-hackers/game/installation-instructions> into <lp:game> but <lp:~game-hackers/game/installation-instructions> remained marked as "Development" instead of automatically being marked as "Merged" and disappearing from <https://code.launchpad.net/game>.

14:52 < abentley> exarkun, I'll have a look.
14:55 < abentley> exarkun, we detected a merge in the opposite direction, from lp:game => lp:~game-hackers/game/installation-instructions and lp:~amacleod/game/client-invocation => lp:~game-hackers/game/installation-instructions
14:56 < abentley> That was at 12:55.
14:57 < abentley> At 13:00, I see Merge detected: lp:~game-hackers/game/installation-instructions => lp:game
14:58 < abentley> And it says "lp:~game-hackers/game/installation-instructions now Merged", which I believe means it set the branch to Merged.
14:59 < exarkun> But it shows up on https://code.launchpad.net/game as "Development"
15:03 < abentley> exarkun, after it was marked merged, it looks like another revision was pushed.
15:05 < exarkun> The last revision on the branch is divmod.com-20110209125926-8d98psdzhqru0vrs and that revision was also included in the merge

[Curtis Hovey (sinzui)]

http://bazaar.launchpad.net/~game-hackers/game/installation-instructions/revision/53
shows that the last revision is not in http://bazaar.launchpad.net/~game-hackers/game/trunk/revision/45 . Maybe that revision was merged locally, but it was not pushed.

I expect the branch will have a merged status when trunk has the "There are two terrain file formats." section in the README.

[Jean-Paul Calderone (exarkun)]

Might you have confused the top-level README with terrain/README? These two URLs show the same content:

http://bazaar.launchpad.net/~game-hackers/game/trunk/view/head:/terrain/README
http://bazaar.launchpad.net/~game-hackers/game/installation-instructions/view/head:/terrain/README

(though for some reason they are colored differently).

Even more compelling, I think, is the fact that according to `bzr log --show-ids --limit 1 lp:game`, one of the parents of the tip of lp:game is:

    <email address hidden>

And according to `bzr log --show-ids --limit 1 lp:~game-hackers/game/installation-instructions`, the tip revision id of that branch is:

    <email address hidden>

In other words, tip of the branch is a parent of tip of trunk.

[Gavin Panella (allenap)]

Jean-Paul, just to be sure, could another member of ~game-hackers, i.e. Christopher Armstrong, have reset the status of the branch? I know it's unlikely but I should check.

I noticed that the last modified date of lp:~game-hackers/game/installation-instructions and lp:game are 52 seconds apart (at r53 and r45 respectively). Assuming the answer to the earlier question is no, there could be a race in there.

[Jean-Paul Calderone (exarkun)]

I asked Chris, he said he hasn't made any changes to the project in some time.

[Robert Collins (lifeless)]

Probably a fairly small logic error (e.g. some incorrect assumption which the race on which merge was detected provoked).

Two branches ending up on the same revid, with an MP open, should probably always merge *into* a series branch, if one is available.