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

[Lukáš Lalinský]

On Po, 2007-08-27 at 12:27 -0400, Aaron Bentley wrote:
> 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.

Thanks, self._convert_tree was exactly what I missed. I've added a new
test for checking the return value of .conflicts(), but I kept also the
blackbox test for status, because it seems to be the only test that
calls show_tree_status with specific_files and revision at the same
time.

Lukas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflicts.diff
Type: text/x-patch
Size: 6035 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070827/6b56cd9c/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Toto je =?ISO-8859-1?Q?digit=E1lne?=
	=?ISO-8859-1?Q?_podp=EDsan=E1?= =?UTF-8?Q?_=C4=8Das=C5=A5?=
	=?ISO-8859-1?Q?_spr=E1vy?=
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070827/6b56cd9c/attachment-0001.pgp