[MERGE] TreeTransform rolls back on exception (#67699)

[Aaron Bentley]

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

Kuno Meyer wrote:
>> Raising our own exception is the correct way to do it, has the same
>> virtues as warnings for human readers, and is not much harder than
>> issuing a warning.  Why do it the wrong way?
> 
> There's no reason.
> 
> Please don't get me wrong: My point was about giving information about
> the file that conflicts (which I still think would be very useful), not
> about the way how this is implemented. I'm sorry if there was a
> misunderstanding.

My point was not "we shouldn't provide this information", it was
"warnings are the wrong way to provide this information".

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

iD8DBQFGzwwc0F+nu1YWqI0RAr+tAKCJI8j/6CPTbIe/2e10Xj5zbJF4RQCfR80t
Z0TvXJqpHzNbWuwBb/2XkFE=
=LCz6
-----END PGP SIGNATURE-----