Mercurial > hg
view tests/test-rebase-interruptions.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.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 13 Jul 2009 16:49:05 +0200 |
parents | 808f03f61ebe |
children | b345b1cc124f |
line wrap: on
line source
% Changes during an interruption - continue @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % - Rebasing B onto E merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Force a commit on C during the interruption 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @ 6: Extra | | o 5: B | | | o 4: E | | | o 3: D | | o | 2: C | | o | 1: B |/ o 0: A % - Resume the rebasing merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on warning: new changesets detected on source branch, not stripping rebase completed @ 7: C | | o 6: Extra | | o | 5: B | | o | 4: E | | o | 3: D | | | o 2: C | | | o 1: B |/ o 0: A % Changes during an interruption - abort @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Rebasing B onto E merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Force a commit on B' during the interruption 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Abort the rebasing warning: new changesets detected on target branch, not stripping @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A