Show More
@@ -1,39 +1,43 b'' | |||
|
1 | 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 | 7 | . "$TESTDIR/bzr-definitions" |
|
4 | 8 | |
|
5 | 9 | echo % test multiple merges at once |
|
6 | 10 | mkdir test-multimerge |
|
7 | 11 | cd test-multimerge |
|
8 | 12 | bzr init -q source |
|
9 | 13 | cd source |
|
10 | 14 | echo content > file |
|
11 | 15 | bzr add -q file |
|
12 | 16 | bzr commit -q -m 'Initial add' |
|
13 | 17 | cd .. |
|
14 | 18 | bzr branch -q source source-branch1 |
|
15 | 19 | cd source-branch1 |
|
16 | 20 | echo morecontent >> file |
|
17 | 21 | echo evenmorecontent > file-branch1 |
|
18 | 22 | bzr add -q file-branch1 |
|
19 | 23 | bzr commit -q -m 'Added branch1 file' |
|
20 | 24 | cd ../source |
|
21 | 25 | sleep 1 |
|
22 | 26 | echo content > file-parent |
|
23 | 27 | bzr add -q file-parent |
|
24 | 28 | bzr commit -q -m 'Added parent file' |
|
25 | 29 | cd .. |
|
26 | 30 | bzr branch -q source source-branch2 |
|
27 | 31 | cd source-branch2 |
|
28 | 32 | echo somecontent > file-branch2 |
|
29 | 33 | bzr add -q file-branch2 |
|
30 | 34 | bzr commit -q -m 'Added brach2 file' |
|
31 | 35 | sleep 1 |
|
32 | 36 | cd ../source |
|
33 | 37 | bzr merge -q ../source-branch1 |
|
34 | 38 | bzr merge -q --force ../source-branch2 |
|
35 | 39 | bzr commit -q -m 'Merged branches' |
|
36 | 40 | cd .. |
|
37 | 41 | hg convert --datesort source source-hg |
|
38 | 42 | glog -R source-hg |
|
39 | 43 | manifest source-hg tip |
General Comments 0
You need to be logged in to leave comments.
Login now