#!/bin/bash

export SCRIPT=$(basename $0)
usage()
{
	echo "Usage: $SCRIPT [-q] [--continue-merge] [--review-merge] [--placebo-merge] <target-version> <ticket>*"
	exit 1
}
export -f usage

source_version=$(LC_ALL=C svn info $(dirname $(readlink -f $0))/../.. |
	sed -n 's/^URL: .*\/\([^/]\+\)\/[^ ]\+\/src$/\1/p' 2>/dev/null)
if [ -z "$source_version" ]
then
	echo "Error: Could not determine source branch version -- do you call this script from a SVN repository checkout?" >&2
	exit 2
fi

# mandatory for trunk-->trunk merges!
opt=--review-merge

while true
do
	case $1 in
	-*) opt+=" $1";;
	*)  break;;
	esac
	shift
done

target_version=$1
shift 1
case $target_version in
*.*)
	;;
*)
	usage
	;;
esac

${0%/*}/merge-changesets $opt branches/$source_version/trunk/src branches/$target_version/trunk/src FFL "" "$@"