#! /bin/sh

set -x
svnadmin create test-repos
export REPO=`(cd test-repos/; pwd)`
mkdir test-import test-import/trunk test-import/branches
echo A file > test-import/trunk/file
( cd test-import/; svn import file:///$REPO -m "Initial import" )
svn cp file:///$REPO/trunk file:///$REPO/branches/br1 -m "Branching"
svn co file:///$REPO/branches/br1 test-wc
cd test-wc

echo New File > file2
svn add file2
svn propset svn:mime-type "image/jpg" file2

svn merge file:///$REPO/trunk file:///$REPO/branches/br1
svn commit -m "Added file"

svn merge file:///$REPO/trunk file:///$REPO/branches/br1
ls -l
svn status