tests/test-convert-cvs-detectmerge
changeset 8350 1f0f01bc86a5
parent 8171 4e5bd9b97bb3
child 9543 56a5f80556f5
equal deleted inserted replaced
8349:e539fa9d3f45 8350:1f0f01bc86a5
     4 # (Should test similar mergeto feature, but I don't understand it yet.)
     4 # (Should test similar mergeto feature, but I don't understand it yet.)
     5 # Requires builtin cvsps.
     5 # Requires builtin cvsps.
     6 
     6 
     7 "$TESTDIR/hghave" cvs || exit 80
     7 "$TESTDIR/hghave" cvs || exit 80
     8 
     8 
     9 export CVSROOT=`pwd`/cvsrepo
     9 CVSROOT=`pwd`/cvsrepo
       
    10 export CVSROOT
    10 
    11 
    11 # XXX copied from test-convert-cvs-synthetic
    12 # XXX copied from test-convert-cvs-synthetic
    12 cvscall()
    13 cvscall()
    13 {
    14 {
    14     echo cvs -f "$@"
    15     echo cvs -f "$@"