view tests/test-merge-remove.out @ 9116:f90bbf1ea09f

inotify: fix issue1375, add a test.

The biggest problem was the data structure, which did not allow changing
a file into a directory or vice versa. This problem is fixed by b55d44719b47.

The walk() method also had an issue in this case:
 - we know 'path' as a directory. inotify server sleeps.
 - 'path' is deleted
 - 'path' is recreated as a file
 - the server catches up here, and see the deletion. it instantiates a scan(),
   which in its turn calls for walk(repo, path).
 - walk() then assumes that 'path' is a directory and calls os.listdir on it,
   which raises an OSError(errno.ENOTDIR)

Catch the error, and yield the file instead of the directory contents.

created new head
merging foo1 and foo to foo1
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r   0         -2 bar
r   0         -1 foo1
copy: foo -> foo1
R bar
R foo1
% readding foo1 and bar
adding bar
adding foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo
% reverting foo1 and bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo