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

Lukáš Lalinský lalinsky at gmail.com
Mon Aug 27 16:37:44 BST 2007


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, but
here I need to test specifically RevisionTree, which will never get
passed to TestCaseWithTree. I guess I could convert each of the working
tree instances to a revision tree by committing them. But then it would
be testing the same thing over and over for each working tree format,
which doesn't make sense to me.

Lukas

-------------- 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/b0cbc6f4/attachment.pgp 


More information about the bazaar mailing list