Mercurial > hg
view tests/test-flags @ 12153:d598d24a7e67 stable
test-convert-cvs: add a sleep to make test more stable
The recent addition of fuzzy tests introduced a new cvs commit which sometimes
fails.
This adds a sleep to make sure that cvs notices that the file has changed,
similar to how it is done in other tests.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 02 Sep 2010 22:38:12 +0200 |
parents | 5b7da468531b |
children |
line wrap: on
line source
#!/bin/sh -e umask 027 mkdir test1 cd test1 hg init touch a b hg add a b hg ci -m "added a b" -d "1000000 0" cd .. hg clone test1 test3 mkdir test2 cd test2 hg init hg pull ../test1 hg co chmod +x a hg ci -m "chmod +x a" -d "1000000 0" echo % the changelog should mention file a: hg tip --template '{files}\n' cd ../test1 echo 123 >>a hg ci -m "a updated" -d "1000000 0" hg pull ../test2 hg heads hg history hg -v merge cd ../test3 echo 123 >>b hg ci -m "b updated" -d "1000000 0" hg pull ../test2 hg heads hg history hg -v merge ls -l ../test[123]/a > foo cut -b 1-10 < foo hg debugindex .hg/store/data/a.i hg debugindex ../test2/.hg/store/data/a.i hg debugindex ../test1/.hg/store/data/a.i