--- a/tests/test-convert-bzr-merges Sun Jan 04 21:49:37 2009 +0100
+++ b/tests/test-convert-bzr-merges Mon Jan 05 12:31:00 2009 +0100
@@ -18,6 +18,7 @@
bzr add -q file-branch1
bzr commit -q -m 'Added branch1 file'
cd ../source
+sleep 3
echo content > file-parent
bzr add -q file-parent
bzr commit -q -m 'Added parent file'
@@ -27,6 +28,7 @@
echo somecontent > file-branch2
bzr add -q file-branch2
bzr commit -q -m 'Added brach2 file'
+sleep 3
cd ../source
bzr merge -q ../source-branch1
bzr merge -q --force ../source-branch2