#!/bin/sh -e
#
# This script is put in the public domain by Henrik Nordström
# <hno@squid-cache.org>. It is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# If you find this script useful then you are encouraged to send feedback
# to the author, but you have absolutely no obligation to do so.
#
# Author:
#   Henrik Nordström <hno@squid-cache.org>
#   http://hem.passagen.se/hno/
#
# Distribution URL:
#   http://devel.squid-cache.org/CVS.html
#
# Version history:
#   2002-10-19  Minor fix to deal with merging into HEAD
#   2001-09-25	First public domain release
#
if [ $# -lt 2 ]; then
   echo "Usage: $0 merge-from files..."
   echo "    where merge-from is the branch you have merged changes from"
   exit 1
fi
if [ -f CVS/Tag ]; then
    localtag=`cat CVS/Tag|cut -c2-`
else
    localtag=HEAD
fi
rootdir=`cat CVS/Root|sed -e 's/.*://'`
module=`cat CVS/Repository|sed -e "s#^$rootdir##"`
mergefrom="$1"
newtag="Z-${localtag}_merge-new_${mergefrom}"
oldtag="Z-${localtag}_merge_${mergefrom}"
shift

ecvs() {
    echo cvs $* >&2
    cvs "$@"
}
o () {
    echo "# $*..."
}

ecvs diff -r ${oldtag} -r ${newtag} "$@"