Wacky weave merge

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEA3/B0F+nu1YWqI0RAkkaAJ9oAgJ2jRQciisSy5cVEBEWZ0u2OgCfddl9
WVlbwrhaZ23ybxX9ZYEEa6k=
=IsiP
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: shelf_tests.py
Type: text/x-python
Size: 5192 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060227/c6283ffc/attachment.py 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: shelf_tests.py.OTHER
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060227/c6283ffc/attachment.diff 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: shelf_tests.py.THIS
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060227/c6283ffc/attachment-0001.diff