view tests/test-resolve.out @ 8381:f52fcc864df4

inotify: server.walk(): use yield instead of for

iterate on subdir when the directory is found, not
once all the directories are found, since yield order doesn't matter

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty