[MERGE] Re: 'bzr remerge' often report about conflict when it is not

[Aaron Bentley]

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

John Arbash Meinel wrote:
> +            self.assertIs(builder.this.is_executable("3"), True)
> +        except:
> +            builder.unlock()
> +            raise
>          return builder
> 
> ^- Is there a reason you are using 'assertIs(..., True)'? It seems a lot
> better to use "self.assertTrue(builder.this.is_executable("1"))"

It's just me fighting Python's boolean evaluation again. "I don't care
if it *evaluates* to True, I care if it *is* True".

I'll change it and submit.

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

iD8DBQFFJFOp0F+nu1YWqI0RAvmlAJ9NXXrYGHNWn+VN8OsLQVzHz2uDggCfbuA9
gNkAj3gWc378dfdACmtqgl8=
=A3aO
-----END PGP SIGNATURE-----