1 #!/bin/sh

     2 

     3 # N.B. bzr 1.13 has a bug that breaks this test.  If you see this

     4 # test fail, check your bzr version.  Upgrading to bzr 1.13.1

     5 # should fix it.

     6 

     7 . "$TESTDIR/bzr-definitions"

     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

    25 sleep 1

    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'

    35 sleep 1

    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