#!/bin/sh -x

# "un branch" your current working branch.  Usage is "unbranch Quotient", while
# you are not currently working on trunk.

PROJECT="$1"
# BRANCH="$2"

TRUNKPATH="$HOME/Projects/svn/$PROJECT/trunk"
# BRANCHPATH="$HOME/Projects/svn/$PROJECT/branches/$USER/$BRANCH"
BRANCHPATH=`readlink "$HOME/Projects/$PROJECT"`

BRANCH_REVISION=`(cd "$BRANCHPATH"; python -c 'from twisted.web.microdom import parse; import os; print parse(os.popen("svn log --stop-on-copy --xml")).documentElement.childNodes[-1].getAttribute("revision")')`
# BRANCH_REVISION=1

(cd $TRUNKPATH; svn up)

svn merge "$BRANCHPATH/@$BRANCH_REVISION" "$BRANCHPATH/@HEAD" "$TRUNKPATH"

chbranch "$PROJECT" trunk

