Show More
| @@ -1,43 +1,68 b'' | |||
|
|
1 | #!/bin/sh | |
|
|
1 | N.B. bzr 1.13 has a bug that breaks this test. If you see this | |
|
|
2 | test fail, check your bzr version. Upgrading to bzr 1.13.1 | |
|
|
3 | should fix it. | |
|
|
2 | 4 | |
|
|
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. | |
|
|
5 | $ . "$TESTDIR/bzr-definitions" | |
|
|
6 | 6 | |
|
|
7 | . "$TESTDIR/bzr-definitions" | |
|
|
7 | test multiple merges at once | |
|
|
8 | 8 | |
|
|
9 | echo % test multiple merges at once | |
|
|
10 |
|
|
|
|
11 | cd test-multimerge | |
|
|
12 | bzr init -q source | |
|
|
13 | cd source | |
|
|
14 | echo content > file | |
|
|
15 | bzr add -q file | |
|
|
16 | bzr commit -q -m 'Initial add' | |
|
|
17 | cd .. | |
|
|
18 |
|
|
|
|
19 | cd source-branch1 | |
|
|
20 |
echo morecontent |
|
|
|
21 | echo evenmorecontent > file-branch1 | |
|
|
22 | bzr add -q file-branch1 | |
|
|
23 | bzr commit -q -m 'Added branch1 file' | |
|
|
24 | cd ../source | |
|
|
25 | sleep 1 | |
|
|
26 | echo content > file-parent | |
|
|
27 | bzr add -q file-parent | |
|
|
28 | bzr commit -q -m 'Added parent file' | |
|
|
29 | cd .. | |
|
|
30 |
|
|
|
|
31 | cd source-branch2 | |
|
|
32 | echo somecontent > file-branch2 | |
|
|
33 | bzr add -q file-branch2 | |
|
|
34 | bzr commit -q -m 'Added brach2 file' | |
|
|
35 | sleep 1 | |
|
|
36 | cd ../source | |
|
|
37 |
bzr merge -q ../source-branch |
|
|
|
38 | bzr merge -q --force ../source-branch2 | |
|
|
39 | bzr commit -q -m 'Merged branches' | |
|
|
40 | cd .. | |
|
|
41 | hg convert --datesort source source-hg | |
|
|
42 | glog -R source-hg | |
|
|
43 | manifest source-hg tip | |
|
|
9 | $ mkdir test-multimerge | |
|
|
10 | $ cd test-multimerge | |
|
|
11 | $ bzr init -q source | |
|
|
12 | $ cd source | |
|
|
13 | $ echo content > file | |
|
|
14 | $ bzr add -q file | |
|
|
15 | $ bzr commit -q -m 'Initial add' | |
|
|
16 | $ cd .. | |
|
|
17 | $ bzr branch -q source source-branch1 | |
|
|
18 | $ cd source-branch1 | |
|
|
19 | $ echo morecontent >> file | |
|
|
20 | $ echo evenmorecontent > file-branch1 | |
|
|
21 | $ bzr add -q file-branch1 | |
|
|
22 | $ bzr commit -q -m 'Added branch1 file' | |
|
|
23 | $ cd ../source | |
|
|
24 | $ sleep 1 | |
|
|
25 | $ echo content > file-parent | |
|
|
26 | $ bzr add -q file-parent | |
|
|
27 | $ bzr commit -q -m 'Added parent file' | |
|
|
28 | $ cd .. | |
|
|
29 | $ bzr branch -q source source-branch2 | |
|
|
30 | $ cd source-branch2 | |
|
|
31 | $ echo somecontent > file-branch2 | |
|
|
32 | $ bzr add -q file-branch2 | |
|
|
33 | $ bzr commit -q -m 'Added brach2 file' | |
|
|
34 | $ sleep 1 | |
|
|
35 | $ cd ../source | |
|
|
36 | $ bzr merge -q ../source-branch1 | |
|
|
37 | $ bzr merge -q --force ../source-branch2 | |
|
|
38 | $ bzr commit -q -m 'Merged branches' | |
|
|
39 | $ cd .. | |
|
|
40 | $ hg convert --datesort source source-hg | |
|
|
41 | initializing destination source-hg repository | |
|
|
42 | scanning source... | |
|
|
43 | sorting... | |
|
|
44 | converting... | |
|
|
45 | 4 Initial add | |
|
|
46 | 3 Added branch1 file | |
|
|
47 | 2 Added parent file | |
|
|
48 | 1 Added brach2 file | |
|
|
49 | 0 Merged branches | |
|
|
50 | $ glog -R source-hg | |
|
|
51 | o 5 "(octopus merge fixup)" files: | |
|
|
52 | |\ | |
|
|
53 | | o 4 "Merged branches" files: file-branch2 | |
|
|
54 | | |\ | |
|
|
55 | o---+ 3 "Added brach2 file" files: file-branch2 | |
|
|
56 | / / | |
|
|
57 | | o 2 "Added parent file" files: file-parent | |
|
|
58 | | | | |
|
|
59 | o | 1 "Added branch1 file" files: file file-branch1 | |
|
|
60 | |/ | |
|
|
61 | o 0 "Initial add" files: file | |
|
|
62 | ||
|
|
63 | $ manifest source-hg tip | |
|
|
64 | % manifest of tip | |
|
|
65 | 644 file | |
|
|
66 | 644 file-branch1 | |
|
|
67 | 644 file-branch2 | |
|
|
68 | 644 file-parent | |
|
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now