Mercurial > hg
view tests/test-rebase-mq-skip @ 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 | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh # This emulates the effects of an hg pull --rebase in which the remote repo # already has one local mq patch echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a hg qinit -c # This must work even with a managed mq queue echo 'c1' > c1 hg add c1 hg commit -d '0 0' -m "C1" echo 'r1' > r1 hg add r1 hg commit -d '1 0' -m "R1" hg up 0 hg qnew p0.patch echo 'p0' > p0 hg add p0 hg qref -m 'P0' hg qnew p1.patch echo 'p1' > p1 hg add p1 hg qref -m 'P1' hg export qtip > p1.patch echo echo '% "Mainstream" import p1.patch' hg up -C 1 hg import p1.patch rm p1.patch echo echo '% Rebase' hg up -C qtip hg rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' hg glog --template '{rev} {desc} tags: {tags}\n'