Mercurial > hg

comparison tests/test-convert-bzr-merges @ 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 d65671beee7f
children 5b3fee9c1f4d
comparison
equal deleted inserted replaced
7603:d702a702259f 7604:7c4765d51c3c
16 echo morecontent >> file 16 echo morecontent >> file
17 echo evenmorecontent > file-branch1 17 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'
25 cd .. 25 cd ..
26 bzr branch -q source source-branch2 26 bzr branch -q source source-branch2
27 cd source-branch2 27 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
35 bzr commit -q -m 'Merged branches' 35 bzr commit -q -m 'Merged branches'
36 cd .. 36 cd ..