Mercurial > hg
annotate tests/test-convert-bzr-merges @ 8144:fca54469480e
ui: introduce new config parser
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 23 Apr 2009 15:40:10 -0500 |
parents | 5b3fee9c1f4d |
children |
rev | line source |
---|---|
7053 | 1 #!/bin/sh |
2 | |
8084
5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.
Greg Ward <greg-hg@gerg.ca>
parents:
7604
diff
changeset
|
3 # N.B. bzr 1.13 has a bug that breaks this test. If you see this |
5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.
Greg Ward <greg-hg@gerg.ca>
parents:
7604
diff
changeset
|
4 # test fail, check your bzr version. Upgrading to bzr 1.13.1 |
5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.
Greg Ward <greg-hg@gerg.ca>
parents:
7604
diff
changeset
|
5 # should fix it. |
5b3fee9c1f4d
Add comment about this test failing under bzr 1.13 due to a bug in bzr.
Greg Ward <greg-hg@gerg.ca>
parents:
7604
diff
changeset
|
6 |
7058
9e6d6568bf7a
`source` doesn't work for some /bin/sh, use `.` instead
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7053
diff
changeset
|
7 . "$TESTDIR/bzr-definitions" |
7053 | 8 |
9 echo % test multiple merges at once | |
10 mkdir test-multimerge | |
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 bzr branch -q source source-branch1 | |
19 cd source-branch1 | |
20 echo morecontent >> file | |
21 echo evenmorecontent > file-branch1 | |
22 bzr add -q file-branch1 | |
23 bzr commit -q -m 'Added branch1 file' | |
24 cd ../source | |
7604
7c4765d51c3c
tests: shrink wait interval for test-convert-bzr-merges
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7602
diff
changeset
|
25 sleep 1 |
7053 | 26 echo content > file-parent |
27 bzr add -q file-parent | |
28 bzr commit -q -m 'Added parent file' | |
29 cd .. | |
30 bzr branch -q source source-branch2 | |
31 cd source-branch2 | |
32 echo somecontent > file-branch2 | |
33 bzr add -q file-branch2 | |
34 bzr commit -q -m 'Added brach2 file' | |
7604
7c4765d51c3c
tests: shrink wait interval for test-convert-bzr-merges
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7602
diff
changeset
|
35 sleep 1 |
7053 | 36 cd ../source |
37 bzr merge -q ../source-branch1 | |
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 |