tests/test-rename-merge2.t
changeset 12743 4c4aeaab2339
parent 12484 59012130b43e
child 12757 62c8f7691bc3
equal deleted inserted replaced
12742:6ab4a7d3c179 12743:4c4aeaab2339
    64   > }
    64   > }
    65   $ up() {
    65   $ up() {
    66   >     cp rev $1
    66   >     cp rev $1
    67   >     hg add $1 2> /dev/null
    67   >     hg add $1 2> /dev/null
    68   >     if [ "$2" != "" ] ; then
    68   >     if [ "$2" != "" ] ; then
    69   > 	cp rev $2
    69   >         cp rev $2
    70   > 	hg add $2 2> /dev/null
    70   >         hg add $2 2> /dev/null
    71   >     fi
    71   >     fi
    72   > }
    72   > }
    73   $ uc() { up $1; hg cp $1 $2; } # update + copy
    73   $ uc() { up $1; hg cp $1 $2; } # update + copy
    74   $ um() { up $1; hg mv $1 $2; }
    74   $ um() { up $1; hg mv $1 $2; }
    75   $ nc() { hg cp $1 $2; } # just copy
    75   $ nc() { hg cp $1 $2; } # just copy