Weird incorrect merge - now actually with simple reproducer

[Max Bowsher]

On 06/08/10 08:22, Martin Pool wrote:
> That does look strange.  What does remerge --show-base show?

It's a cherrypick so I can't 'bzr remerge', but if I revert and re-issue
the merge with --show-base, I get this:

> public class MergeIssue extends BaseClass {
>     
>     @Override
> <<<<<<< TREE
>     public void filterDown(Message msg, Resources res) throws RejectedException, BreakoutException {
>             if(msg.getFlag(MessageFlag.SEEN)) {	/* Allow msg through if we've already processed it */
> ||||||| BASE-REVISION
>             if(msg.getFlag(MessageFlag.SEEN)) {	/* Allow msg through if we've already processed it */
> =======
>             if(msg.getFlag(MessageFlag.SEEN)) {    /* Allow msg through if we've already processed it */
> >>>>>>> MERGE-SOURCE
>                 return;
>             }
> 


Max.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100806/acbdcc36/attachment.pgp