[merge]problems with committing merges in a dirstate tree with a symlink
martinpool at gmail.com
Tue Mar 13 03:00:44 GMT 2007
On 13/03/07, Martin Pool <mbp at canonical.com> wrote:
> Martin Pool has voted +1 (conditional).
> Status is now: Conditionally approved
> - else:
> - assert 'unknown kind'
> + elif kind != 'symlink':
> + assert False, 'unknown kind'
> While this fix is correct I'd like in general to make assertion messages
> have a bit more information. Users do hit them and report bugs from
> time to time. If you included the actual kind, then the error report
> will be a bit more useful and we will avoid one roundtrip to the user.
> Also you might as well just raise AssertionError if it's done
I changed that and merged.
More information about the bazaar