[merge] Decent error when a path changes kind

[Martin Pool]

On  5 Feb 2007, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----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.

I thought there were some cases handled by this that weren't covered by
your change?  If not, then I guess this is obsolete.

-- 
Martin