tests/test-push-warn
changeset 2021 fc22ed56afe3
parent 1933 7544700fd931
child 2283 e506c14382fd
equal deleted inserted replaced
2020:00925397236c 2021:fc22ed56afe3
    24 hg pull ../a
    24 hg pull ../a
    25 hg push ../a
    25 hg push ../a
    26 hg up -m
    26 hg up -m
    27 hg commit -m "4" -d "1000000 0"
    27 hg commit -m "4" -d "1000000 0"
    28 hg push ../a
    28 hg push ../a
       
    29 cd ..
       
    30 
       
    31 hg init c
       
    32 cd c
       
    33 for i in 0 1 2; do
       
    34     echo $i >> foo
       
    35     hg ci -Am $i -d "1000000 0"
       
    36 done
       
    37 cd ..
       
    38 
       
    39 hg clone c d
       
    40 cd d
       
    41 for i in 0 1; do
       
    42     hg co -C $i
       
    43     echo d-$i >> foo
       
    44     hg ci -m d-$i -d "1000000 0"
       
    45 done
       
    46 
       
    47 HGMERGE=true hg co -m 3
       
    48 hg ci -m c-d -d "1000000 0"
       
    49 
       
    50 hg push ../c
       
    51 hg push -r 2 ../c
       
    52 hg push -r 3 -r 4 ../c
       
    53 hg push -r 5 ../c
       
    54 
       
    55 exit 0