[MERGE] remerge doesn't clobber unrelated conflicts

Aaron Bentley aaron.bentley at utoronto.ca
Sun Jul 2 20:19:31 BST 2006


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

John Arbash Meinel wrote:
> I won't block on the assertEqual stuff, but I think we are trying to do
> 'expected, actual'. Otherwise +1.

My recollection is that our discussions have been inconclusive.  We have
a pretty even mix of 'expected, actual' and 'actual, expected'.  If you
look at the asymmetric methods we've added to TestCase:

assertStartsWith: actual, expected
assertEndsWith: actual, expected
assertContainsRe: actual, expected
assertNotContainstRe: actual, expected
assertSubset: depends on usage
assertTransportMode: actual, expected
assertIsInstance: actual, expected
assertFileEqual: expected, actual

I find 'expected, actual' formulations are unituitive and produce
unintuitive diagnostics.  They strike me as brain damage from C-like
languages, where "5 == x" is a safer to write than "x == 5".

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

iD8DBQFEqBxD0F+nu1YWqI0RAvL3AJ9xXxA7uzLzlYCAuPToIY4XF92fewCfTtrs
pQtswRzZx4KsywqxG30iF6c=
=rtp3
-----END PGP SIGNATURE-----




More information about the bazaar mailing list