##// END OF EJS Templates
tests: shrink wait interval for test-convert-bzr-merges
Dirkjan Ochtman -
r7604:7c4765d5 default
parent child Browse files
Show More
@@ -18,7 +18,7 b' echo evenmorecontent > file-branch1'
18 bzr add -q file-branch1
18 bzr add -q file-branch1
19 bzr commit -q -m 'Added branch1 file'
19 bzr commit -q -m 'Added branch1 file'
20 cd ../source
20 cd ../source
21 sleep 3
21 sleep 1
22 echo content > file-parent
22 echo content > file-parent
23 bzr add -q file-parent
23 bzr add -q file-parent
24 bzr commit -q -m 'Added parent file'
24 bzr commit -q -m 'Added parent file'
@@ -28,7 +28,7 b' cd source-branch2'
28 echo somecontent > file-branch2
28 echo somecontent > file-branch2
29 bzr add -q file-branch2
29 bzr add -q file-branch2
30 bzr commit -q -m 'Added brach2 file'
30 bzr commit -q -m 'Added brach2 file'
31 sleep 3
31 sleep 1
32 cd ../source
32 cd ../source
33 bzr merge -q ../source-branch1
33 bzr merge -q ../source-branch1
34 bzr merge -q --force ../source-branch2
34 bzr merge -q --force ../source-branch2
General Comments 0
You need to be logged in to leave comments. Login now