tests/test-rename-merge2.t
changeset 42152 344066b54a7b
parent 39707 5abc47d4ca6b
child 42164 96bd75e67a94
equal deleted inserted replaced
42151:7116fc614cfc 42152:344066b54a7b
    66   >     if [ "$2" != "" ] ; then
    66   >     if [ "$2" != "" ] ; then
    67   >         cp rev $2
    67   >         cp rev $2
    68   >         hg add $2 2> /dev/null
    68   >         hg add $2 2> /dev/null
    69   >     fi
    69   >     fi
    70   > }
    70   > }
    71   $ uc() { up $1; hg cp $1 $2; } # update + copy
       
    72   $ um() { up $1; hg mv $1 $2; }
    71   $ um() { up $1; hg mv $1 $2; }
    73   $ nc() { hg cp $1 $2; } # just copy
    72   $ nc() { hg cp $1 $2; } # just copy
    74   $ nm() { hg mv $1 $2; } # just move
    73   $ nm() { hg mv $1 $2; } # just move
    75   $ tm "up a  " "nc a b" "      " "1  get local a to b"
    74   $ tm "up a  " "nc a b" "      " "1  get local a to b"
    76   created new head
    75   created new head