Mercurial > hg
view tests/test-filebranch @ 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 | 3f754be7abbb |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh # This test makes sure that we don't mark a file as merged with its ancestor # when we do a merge. cat <<EOF > merge import sys, os print "merging for", os.path.basename(sys.argv[1]) EOF HGMERGE="python ../merge"; export HGMERGE echo creating base hg init a cd a echo 1 > foo echo 1 > bar echo 1 > baz echo 1 > quux hg add foo bar baz quux hg commit -m "base" -d "1000000 0" cd .. hg clone a b echo creating branch a cd a echo 2a > foo echo 2a > bar hg commit -m "branch a" -d "1000000 0" echo creating branch b cd .. cd b echo 2b > foo echo 2b > baz hg commit -m "branch b" -d "1000000 0" echo "we shouldn't have anything but n state here" hg debugstate --nodates | grep -v "^n" echo merging hg pull ../a hg merge -v echo 2m > foo echo 2b > baz echo new > quux echo "we shouldn't have anything but foo in merge state here" hg debugstate --nodates | grep "^m" hg ci -m "merge" -d "1000000 0" echo "main: we should have a merge here" hg debugindex .hg/store/00changelog.i echo "log should show foo and quux changed" hg log -v -r tip echo "foo: we should have a merge here" hg debugindex .hg/store/data/foo.i echo "bar: we shouldn't have a merge here" hg debugindex .hg/store/data/bar.i echo "baz: we shouldn't have a merge here" hg debugindex .hg/store/data/baz.i echo "quux: we shouldn't have a merge here" hg debugindex .hg/store/data/quux.i echo "manifest entries should match tips of all files" hg manifest --debug echo "everything should be clean now" hg status hg verify