Wacky weave merge

[David Allouche]

On Mon, 2006-02-27 at 17:40 -0500, Aaron Bentley wrote:
> I'm getting some odd behavour from weave merge when merging
> http://panoramicfeedback.com/opensource/bzr/bzrtools/ into
> http://panoramicfeedback.com/opensource/bzr/bzrtools-baz2bzr/
> 
> It's deleting the head of shelf_tests, and it looks like it's not adding
> a conflict marker, or the (presumably unconflicted) head.

Me too.

I am experiencing the same problem with a merge on Launchpad.
-- 
                                                            -- ddaa
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060228/b06efa7a/attachment.pgp