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