Mercurial > hg
view tests/test-convert-splicemap @ 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 | 5b7da468531b |
children | bb5ea66789e3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo 'hgext.graphlog =' >> $HGRCPATH glog() { hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" } hg init repo1 cd repo1 echo a > a hg ci -Am adda echo b > b echo a >> a hg ci -Am addb PARENTID1=`hg id --debug -i` echo c > c hg ci -Am addc PARENTID2=`hg id --debug -i` cd .. hg init repo2 cd repo2 echo b > a echo d > d hg ci -Am addaandd CHILDID1=`hg id --debug -i` echo d >> d hg ci -Am changed CHILDID2=`hg id --debug -i` echo e > e hg ci -Am adde cd .. echo '% test invalid splicemap' cat > splicemap <<EOF $CHILDID2 EOF hg convert --splicemap splicemap repo2 repo1 echo '% splice repo2 on repo1' cat > splicemap <<EOF $CHILDID1 $PARENTID1 $CHILDID2 $PARENTID2,$CHILDID1 EOF hg clone repo1 target1 hg convert --splicemap splicemap repo2 target1 glog -R target1