filterpath()

{

    eval "$@" | sed "s:$CVSROOT:*REPO*:g"

}

    echo cvs -f "$@"

# output of 'cvs ci' varies unpredictably, so discard most of it

# -- just keep the part that matters

cvsci()

{

    echo cvs -f ci "$@"

    cvs -f ci "$@" 2>&1 | egrep "^(new|initial) revision:"

}

echo "% create cvs repository"

filterpath cvscall -Q -d "$CVSROOT" init

echo "% checkout #1: add foo.txt"

cvscall -Q checkout -d cvsworktmp .

cvscall -Q add foo

cvscall -Q add foo.txt 

cvsci -m "foo.txt"

echo "% checkout #2: create MYBRANCH1 and modify foo.txt on it"

cvscall -Q checkout -d cvswork foo

cvscall -Q update -P -r MYBRANCH1

cvsci -m "bar"

cvsci -m "baz"

echo "% create MYBRANCH1_2 and modify foo.txt some more"

cvscall -Q update -P -r MYBRANCH1_2

cvsci -m "bazzie"

echo "% create MYBRANCH1_1 and modify foo.txt yet again"

cvscall -Q update -P -r MYBRANCH1_1

cvsci -m "quux"

echo "% merge MYBRANCH1 to MYBRANCH1_1"

filterpath cvscall -Q update -P -jMYBRANCH1

echo xyzzy > foo.txt

cvsci -m "merge1"

echo "% return to trunk and merge MYBRANCH1_2"

cvscall -Q update -P -A

filterpath cvscall -Q update -P -jMYBRANCH1_2

cvsci -m "merge2"