| author | Marek Kubica <marek@xivilization.net> |
| Mon, 05 Jan 2009 12:31:00 +0100 | |
| changeset 7602 | d65671beee7f |
| parent 7058 | 9e6d6568bf7a |
| child 7604 | 7c4765d51c3c |
| permissions | -rwxr-xr-x |
| 7053 | 1 |
#!/bin/sh |
2 |
||
|
7058
9e6d6568bf7a
`source` doesn't work for some /bin/sh, use `.` instead
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7053
diff
changeset
|
3 |
. "$TESTDIR/bzr-definitions" |
| 7053 | 4 |
|
5 |
echo % test multiple merges at once |
|
6 |
mkdir test-multimerge |
|
7 |
cd test-multimerge |
|
8 |
bzr init -q source |
|
9 |
cd source |
|
10 |
echo content > file |
|
11 |
bzr add -q file |
|
12 |
bzr commit -q -m 'Initial add' |
|
13 |
cd .. |
|
14 |
bzr branch -q source source-branch1 |
|
15 |
cd source-branch1 |
|
16 |
echo morecontent >> file |
|
17 |
echo evenmorecontent > file-branch1 |
|
18 |
bzr add -q file-branch1 |
|
19 |
bzr commit -q -m 'Added branch1 file' |
|
20 |
cd ../source |
|
|
7602
d65671beee7f
tests: try to prevent different ordering in test-convert-bzr-merges
Marek Kubica <marek@xivilization.net>
parents:
7058
diff
changeset
|
21 |
sleep 3 |
| 7053 | 22 |
echo content > file-parent |
23 |
bzr add -q file-parent |
|
24 |
bzr commit -q -m 'Added parent file' |
|
25 |
cd .. |
|
26 |
bzr branch -q source source-branch2 |
|
27 |
cd source-branch2 |
|
28 |
echo somecontent > file-branch2 |
|
29 |
bzr add -q file-branch2 |
|
30 |
bzr commit -q -m 'Added brach2 file' |
|
|
7602
d65671beee7f
tests: try to prevent different ordering in test-convert-bzr-merges
Marek Kubica <marek@xivilization.net>
parents:
7058
diff
changeset
|
31 |
sleep 3 |
| 7053 | 32 |
cd ../source |
33 |
bzr merge -q ../source-branch1 |
|
34 |
bzr merge -q --force ../source-branch2 |
|
35 |
bzr commit -q -m 'Merged branches' |
|
36 |
cd .. |
|
37 |
hg convert --datesort source source-hg |
|
38 |
glog -R source-hg |
|
39 |
manifest source-hg tip |