#!/bin/bash export SCRIPT=$(basename $0) usage() { echo "Usage: $SCRIPT [-q] [--continue-merge] [--review-merge] *" exit 1 } export -f usage version=$(LC_ALL=C svn info $(dirname $(readlink -f $0))/../.. | sed -n 's/^URL: .*\/\([^/]\+\)\/[^ ]\+\/src$/\1/p' 2>/dev/null) if [ -z "$version" ] then echo "Error: Could not determine branch version -- do you call this script from a SVN repository checkout?" >&2 exit 2 fi opt= while true do case $1 in --placebo-merge) echo "Error: You are not allowed to use --placebo-merge when committing to the stable branch" >&2 exit 3 ;; -*) opt+=" $1" ;; *) break ;; esac shift done ${0%/*}/merge-changesets $opt branches/$version/testing/src branches/$version/stable/src FFL "" "$@"