tests/test-transplant
changeset 3724 ea523d6f5f1a
parent 3714 198173f3957c
child 3726 752884db5037
equal deleted inserted replaced
3723:c828fca6f38a 3724:ea523d6f5f1a
    56 hg ci -Amb4 -d '3 0'
    56 hg ci -Amb4 -d '3 0'
    57 cd ..
    57 cd ..
    58 hg clone t pullback
    58 hg clone t pullback
    59 cd pullback
    59 cd pullback
    60 hg transplant -s ../remote -a -b tip
    60 hg transplant -s ../remote -a -b tip
       
    61 
       
    62 echo '% transplant --continue'
       
    63 hg init ../tc
       
    64 cd ../tc
       
    65 cat <<EOF > foo
       
    66 foo
       
    67 bar
       
    68 baz
       
    69 EOF
       
    70 hg ci -Amfoo -d '0 0'
       
    71 cat <<EOF > foo
       
    72 foo2
       
    73 bar2
       
    74 baz2
       
    75 EOF
       
    76 hg ci -mfoo2 -d '0 0'
       
    77 echo bar > bar
       
    78 hg ci -Ambar -d '0 0'
       
    79 echo bar2 >> bar
       
    80 hg ci -mbar2 -d '0 0'
       
    81 hg up 0
       
    82 echo foobar > foo
       
    83 hg ci -mfoobar -d '0 0'
       
    84 hg transplant 1:3
       
    85 echo merge > foo
       
    86 hg transplant --continue