#! /bin/sh
# edk-ecos-commit-merge -- commits the latest merge of upstream eCos with
# the local ecos repository.
#
# Instructions:
# 1. Run
#    $ edk-ecos-import-upstream <directory>
# 2. Manually fix conflicts in <directory>/ecos-merged
# 3. Run
#    $ edk-ecos-import-upstream <directory>

set -e

if [ -z "$1" ]; then
    echo "Usage:"
    echo "  $(basename $0) <directory>"
    exit 1
fi

TOPDIR=$1

LATEST_IMPORT_TAG=ECOS_LATEST_IMPORT
TAG_DATE=$(date "+%Y%m%d")
HUMAN_DATE=$(date)

if [ ! -d ${TOPDIR}/ecos-merged ]; then
    echo "$(basename $0): \`${TOPDIR}' doesn't contain the merged ecos tree"
    exit 1
fi

cd ${TOPDIR}/ecos-merged
cvs commit -m "Merged from upstream CVS (${HUMAN_DATE})."

# Move the ECOS_LATEST_IMPORT tag
cvs rtag -F -r ECOS_${TAG_DATE} ${LATEST_IMPORT_TAG} ecos