0.0.6 merge borked ?

[Robert Collins]

Hi, I have two branches involved in this:
mine @ http://www.robertcollins.net/twisted_sprint/fingerd (rev 13 at
time of writing)
radix's @ http://twistedmatrix.com/users/radix/fingerd (revision 13 at
the time of writing)

Merging from radix into mine reverts out at least one commit from me -
which it should not do:

$ bzr diff
$ bzr merge http://twistedmatrix.com/users/radix/fingerd
0 conflicts encountered.

$ bzr st
modified:
  FOLLOWME
  Makefile
  lib/fingerd/data.py
  lib/fingerd/protocols.py
  lib/fingerd/tests/test_data.py
  lib/fingerd/tests/test_fingerd.py
  lib/fingerd/tests/test_protocols.py

The only commit Chris had done was to Makefile.

Cheers,
Rob


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- 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/20050820/e2f24940/attachment.pgp