tests/test-merge5.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Thu, 21 May 2009 19:26:15 +0900
changeset 8609 aeaa0bd9dc24
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
inotify: process all inotify events in one batch When several inotify events happen, we don't have to process each event separately, calling everytime repowatcher.read_events() to fetch events from the underlying watcher: it is sufficient to call once read_events, to fetch all the events from the watcher.

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')