Mercurial > hg
view tests/test-convert-bzr-merges @ 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 | 5b3fee9c1f4d |
children |
line wrap: on
line source
#!/bin/sh # N.B. bzr 1.13 has a bug that breaks this test. If you see this # test fail, check your bzr version. Upgrading to bzr 1.13.1 # should fix it. . "$TESTDIR/bzr-definitions" echo % test multiple merges at once mkdir test-multimerge cd test-multimerge bzr init -q source cd source echo content > file bzr add -q file bzr commit -q -m 'Initial add' cd .. bzr branch -q source source-branch1 cd source-branch1 echo morecontent >> file echo evenmorecontent > file-branch1 bzr add -q file-branch1 bzr commit -q -m 'Added branch1 file' cd ../source sleep 1 echo content > file-parent bzr add -q file-parent bzr commit -q -m 'Added parent file' cd .. bzr branch -q source source-branch2 cd source-branch2 echo somecontent > file-branch2 bzr add -q file-branch2 bzr commit -q -m 'Added brach2 file' sleep 1 cd ../source bzr merge -q ../source-branch1 bzr merge -q --force ../source-branch2 bzr commit -q -m 'Merged branches' cd .. hg convert --datesort source source-hg glog -R source-hg manifest source-hg tip