Mercurial > hg-stable

changeset 7604:7c4765d51c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: shrink wait interval for test-convert-bzr-merges
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 05 Jan 2009 18:45:20 +0100
parents d702a702259f
children 3e592067515d
files tests/test-convert-bzr-merges
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-bzr-merges	Mon Jan 05 14:37:46 2009 +0100
+++ b/tests/test-convert-bzr-merges	Mon Jan 05 18:45:20 2009 +0100
@@ -18,7 +18,7 @@
 bzr add -q file-branch1
 bzr commit -q -m 'Added branch1 file'
 cd ../source
-sleep 3
+sleep 1
 echo content > file-parent
 bzr add -q file-parent
 bzr commit -q -m 'Added parent file'
@@ -28,7 +28,7 @@
 echo somecontent > file-branch2
 bzr add -q file-branch2
 bzr commit -q -m 'Added brach2 file'
-sleep 3
+sleep 1
 cd ../source
 bzr merge -q ../source-branch1
 bzr merge -q --force ../source-branch2