Show More
@@ -14,30 +14,30 test multiple merges at once | |||||
14 | $ cd source |
|
14 | $ cd source | |
15 | $ echo content > file |
|
15 | $ echo content > file | |
16 | $ bzr add -q file |
|
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 | $ cd .. |
|
18 | $ cd .. | |
19 | $ bzr branch -q source source-branch1 |
|
19 | $ bzr branch -q source source-branch1 | |
20 | $ cd source-branch1 |
|
20 | $ cd source-branch1 | |
21 | $ echo morecontent >> file |
|
21 | $ echo morecontent >> file | |
22 | $ echo evenmorecontent > file-branch1 |
|
22 | $ echo evenmorecontent > file-branch1 | |
23 | $ bzr add -q file-branch1 |
|
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 | $ cd ../source |
|
25 | $ cd ../source | |
26 | $ sleep 1 |
|
26 | $ sleep 1 | |
27 | $ echo content > file-parent |
|
27 | $ echo content > file-parent | |
28 | $ bzr add -q file-parent |
|
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 | $ cd .. |
|
30 | $ cd .. | |
31 | $ bzr branch -q source source-branch2 |
|
31 | $ bzr branch -q source source-branch2 | |
32 | $ cd source-branch2 |
|
32 | $ cd source-branch2 | |
33 | $ echo somecontent > file-branch2 |
|
33 | $ echo somecontent > file-branch2 | |
34 | $ bzr add -q file-branch2 |
|
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 | $ sleep 1 |
|
36 | $ sleep 1 | |
37 | $ cd ../source |
|
37 | $ cd ../source | |
38 | $ bzr merge -q ../source-branch1 |
|
38 | $ bzr merge -q ../source-branch1 | |
39 | $ bzr merge -q --force ../source-branch2 |
|
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 | $ cd .. |
|
41 | $ cd .. | |
42 | $ hg convert --datesort source source-hg |
|
42 | $ hg convert --datesort source source-hg | |
43 | initializing destination source-hg repository |
|
43 | initializing destination source-hg repository |
General Comments 0
You need to be logged in to leave comments.
Login now