[MERGE] Return ConflictsList() instead of [] from Tree.conflicts

[Aaron Bentley]

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

Lukáš Lalinský wrote:
> On Po, 2007-08-27 at 11:29 -0400, Aaron Bentley wrote:
>> Since the bug is in Tree, not status, I think we need a test in
>> bzrlib/tests/tree_implementations.
> 
> Well, I must admit that tests.*tree_implementations is something that
> sill confuses me. It seems to be oriented on testing working trees

No.  That's tests.working_tree_implementations.  tree_implementations
tests all tree types, including RevisionTree and DirStateRevisionTree.

With tree_implementations, you create a working tree with the content
you want, then convert it into the desired tree type using
self._convert_tree.

Have a look at
tests.tree_implementationtest_tree.TestExtractFilesBytes.test_iter_files_bytes
for an example.

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

iD8DBQFG0vtY0F+nu1YWqI0RAi7aAJ44834Xb4obTo2j5yJOJsZO22yOfwCfVm5I
UZMGoMC3N+k+VwIf6/HVWRg=
=16iV
-----END PGP SIGNATURE-----