Mercurial > hg-stable
view tests/test-rebase-abort.out @ 8609:aeaa0bd9dc24
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.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Thu, 21 May 2009 19:26:15 +0900 |
parents | 808f03f61ebe |
children | b345b1cc124f |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1 % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Abort rebase aborted @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1