tests/test-merge5
changeset 415 c2b9502a4e96
child 749 7e4843b7efd2
equal deleted inserted replaced
414:291a62848f54 415:c2b9502a4e96
       
     1 #!/bin/sh -x
       
     2 
       
     3 mkdir t
       
     4 cd t
       
     5 hg init
       
     6 echo This is file a1 > a
       
     7 echo This is file b1 > b
       
     8 hg add a b
       
     9 hg commit -t "commit #0" -d "0 0" -u user
       
    10 echo This is file b22 > b
       
    11 hg commit -t"comment #1" -d "0 0" -u user
       
    12 hg update 0
       
    13 rm b
       
    14 hg commit -A -t"comment #2" -d "0 0" -u user
       
    15 # in theory, we shouldn't need the "yes k" below, but it prevents
       
    16 # this test from hanging when "hg update" erroneously prompts the
       
    17 # user for "keep or delete"
       
    18 yes k | hg update 1
       
    19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing
       
    20 # us to fail this test
       
    21 exit 0