view tests/test-merge5.out @ 8069:82e28c7be8fb

inotify: Do not raise TypeError when client.query returns None

When something went wrong in client.query, it returns None.
If inotify.debug=True, we will attempt in this case a zip(A, None, B), which
would raise a TypeError.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')