Show More
@@ -1,39 +1,43 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
|
3 | # N.B. bzr 1.13 has a bug that breaks this test. If you see this | |||
|
4 | # test fail, check your bzr version. Upgrading to bzr 1.13.1 | |||
|
5 | # should fix it. | |||
|
6 | ||||
3 | . "$TESTDIR/bzr-definitions" |
|
7 | . "$TESTDIR/bzr-definitions" | |
4 |
|
8 | |||
5 | echo % test multiple merges at once |
|
9 | echo % test multiple merges at once | |
6 | mkdir test-multimerge |
|
10 | mkdir test-multimerge | |
7 | cd test-multimerge |
|
11 | cd test-multimerge | |
8 | bzr init -q source |
|
12 | bzr init -q source | |
9 | cd source |
|
13 | cd source | |
10 | echo content > file |
|
14 | echo content > file | |
11 | bzr add -q file |
|
15 | bzr add -q file | |
12 | bzr commit -q -m 'Initial add' |
|
16 | bzr commit -q -m 'Initial add' | |
13 | cd .. |
|
17 | cd .. | |
14 | bzr branch -q source source-branch1 |
|
18 | bzr branch -q source source-branch1 | |
15 | cd source-branch1 |
|
19 | cd source-branch1 | |
16 | echo morecontent >> file |
|
20 | echo morecontent >> file | |
17 | echo evenmorecontent > file-branch1 |
|
21 | echo evenmorecontent > file-branch1 | |
18 | bzr add -q file-branch1 |
|
22 | bzr add -q file-branch1 | |
19 | bzr commit -q -m 'Added branch1 file' |
|
23 | bzr commit -q -m 'Added branch1 file' | |
20 | cd ../source |
|
24 | cd ../source | |
21 | sleep 1 |
|
25 | sleep 1 | |
22 | echo content > file-parent |
|
26 | echo content > file-parent | |
23 | bzr add -q file-parent |
|
27 | bzr add -q file-parent | |
24 | bzr commit -q -m 'Added parent file' |
|
28 | bzr commit -q -m 'Added parent file' | |
25 | cd .. |
|
29 | cd .. | |
26 | bzr branch -q source source-branch2 |
|
30 | bzr branch -q source source-branch2 | |
27 | cd source-branch2 |
|
31 | cd source-branch2 | |
28 | echo somecontent > file-branch2 |
|
32 | echo somecontent > file-branch2 | |
29 | bzr add -q file-branch2 |
|
33 | bzr add -q file-branch2 | |
30 | bzr commit -q -m 'Added brach2 file' |
|
34 | bzr commit -q -m 'Added brach2 file' | |
31 | sleep 1 |
|
35 | sleep 1 | |
32 | cd ../source |
|
36 | cd ../source | |
33 | bzr merge -q ../source-branch1 |
|
37 | bzr merge -q ../source-branch1 | |
34 | bzr merge -q --force ../source-branch2 |
|
38 | bzr merge -q --force ../source-branch2 | |
35 | bzr commit -q -m 'Merged branches' |
|
39 | bzr commit -q -m 'Merged branches' | |
36 | cd .. |
|
40 | cd .. | |
37 | hg convert --datesort source source-hg |
|
41 | hg convert --datesort source source-hg | |
38 | glog -R source-hg |
|
42 | glog -R source-hg | |
39 | manifest source-hg tip |
|
43 | manifest source-hg tip |
General Comments 0
You need to be logged in to leave comments.
Login now