Mercurial > hg
view tests/test-mq-merge.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.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Wed, 08 Apr 2009 14:15:18 +0900 |
parents | fb32ae9c76e7 |
children | 9a398dd53bcc |
line wrap: on
line source
adding a adding b copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b created new head a b merging with queue at: .hg/patches.1 applying rm_a now at: rm_a b patch queue now empty % init t2 adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create the reference queue 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge merging with queue at refqueue (working directory not at tip) applying patcha now at: patcha