Mercurial > hg
comparison tests/test-convert-bzr-merges @ 7053:209ef5f3534c
convert: add bzr source
author | Marek Kubica <marek@xivilization.net> |
---|---|
date | Fri, 26 Sep 2008 20:33:47 +0200 |
parents | |
children | 9e6d6568bf7a |
comparison
equal
deleted
inserted
replaced
7052:0ca4f42daed7 | 7053:209ef5f3534c |
---|---|
1 #!/bin/sh | |
2 | |
3 source "$TESTDIR/bzr-definitions" | |
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 | |
21 echo content > file-parent | |
22 bzr add -q file-parent | |
23 bzr commit -q -m 'Added parent file' | |
24 cd .. | |
25 bzr branch -q source source-branch2 | |
26 cd source-branch2 | |
27 echo somecontent > file-branch2 | |
28 bzr add -q file-branch2 | |
29 bzr commit -q -m 'Added brach2 file' | |
30 cd ../source | |
31 bzr merge -q ../source-branch1 | |
32 bzr merge -q --force ../source-branch2 | |
33 bzr commit -q -m 'Merged branches' | |
34 cd .. | |
35 hg convert --datesort source source-hg | |
36 glog -R source-hg | |
37 manifest source-hg tip |