tests/test-newbranch
changeset 3435 2576b6731524
child 3451 196baf20232b
equal deleted inserted replaced
3434:d0459ec1455d 3435:2576b6731524
       
     1 #!/bin/sh
       
     2 
       
     3 hg init t
       
     4 cd t
       
     5 
       
     6 echo foo > a
       
     7 hg add a
       
     8 hg ci -m "initial" -d "0 0"
       
     9 echo foo > .hg/branch
       
    10 hg ci -m "add branch name" -d "0 0"
       
    11 echo bar > .hg/branch
       
    12 hg ci -m "change branch name" -d "0 0"
       
    13 rm .hg/branch
       
    14 hg ci -m "clear branch name" -d "0 0"
       
    15 
       
    16 hg co foo
       
    17 cat .hg/branch
       
    18 echo bleah > a
       
    19 hg ci -m "modify a branch" -d "0 0"
       
    20 
       
    21 hg merge
       
    22 cat .hg/branch
       
    23 HG_MERGE=true hg ci -m "merge" -d "0 0"
       
    24 hg log
       
    25 
       
    26