[merge] Decent error when a path changes kind
aaron.bentley at utoronto.ca
Mon Feb 5 13:43:00 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Martin Pool wrote:
> On 5 Feb 2007, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>>-----BEGIN PGP SIGNED MESSAGE-----
>>Martin Pool wrote:
>>>Martin Pool has voted +1.
>>>Status is now: Approved
>>>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.
In terms of delta._compare_trees, everything is supported. There is
probably some work still to do on commit, merge, but this patch is obsolete.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar