#!/bin/bash

stagingBranch=$1

if [ -z "$stagingBranch" ]; then

    stagingBranch=4.6

fi

git checkout qtwebkit-$stagingBranch-staging

if [ $? != 0 ]; then

    echo "could not switch to staging branch"

    exit 1

fi

branch=git-svn

git rev-parse --verify -q $branch >/dev/null

if [ $? != 0 ]; then

    branch=origin/svn/master

fi

echo "resetting to $branch"

git reset --hard $branch

for branch in `git branch -r | grep origin | grep staging/$stagingBranch`; do

    remote=`echo $branch | sed -e "s,/.*,,"`

    branch=`echo $branch | sed -e "s,$remote/,,"`

    echo "merging $branch"

    git pull --no-ff $remote $branch

    if [ $? != 0 ]; then

        echo "merge failed. trying my luck with resolve-ChangeLogs"

        (WebKitTools/Scripts/resolve-ChangeLogs && git commit) || exit 1

    fi

done