Mercurial > hg-stable

changeset 7602:d65671beee7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: try to prevent different ordering in test-convert-bzr-merges
author Marek Kubica <marek@xivilization.net>
date Mon, 05 Jan 2009 12:31:00 +0100
parents 49355875c805
children d702a702259f
files tests/test-convert-bzr-merges
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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