[merge] Decent error when a path changes kind

[Aaron Bentley]

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

Martin Pool wrote:
> Martin Pool has voted +1.
> Status is now: Approved
> Comment:
> yes, let's do it.
> 
> My only suggestion would be that perhaps we should also include the bug
> number in the error message.

Since kind change is no longer treated as an error, doing this would be
a step backwards, I think.

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

iD8DBQFFxygA0F+nu1YWqI0RAhgoAJ4wZUr9+0/didg9mbcIgL5szW+hvwCbBcqd
jew65cDkrixc7SnJb4lwLQI=
=r9zB
-----END PGP SIGNATURE-----