view tests/test-merge4 @ 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.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"