version 3 trees pull bug

[Robert Collins]

'pull' in v3 trees is not merging in the right content.

Attached is a patch with a tree interface test to check it works and a
bugfix.

$wc -l fix-pull-v3-tree.patch 
140 fix-pull-v3-tree.patch
$ diffstat fix-pull-v3-tree.patch 
 tests/workingtree_implementations/__init__.py         |    1 
 tests/workingtree_implementations/test_pull.py        |   67
++++++++++++++++++
 tests/workingtree_implementations/test_workingtree.py |   23 ------
 workingtree.py                                        |    4 -
 4 files changed, 71 insertions(+), 24 deletions(-)

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-pull-v3-tree.patch
Type: text/x-patch
Size: 5921 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060222/5cc66f0f/attachment.bin 
-------------- 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/20060222/5cc66f0f/attachment.pgp