#!/bin/sh

LPATH=`pwd`

#SVN=/usr/bin/svn
#SVNADMIN=/usr/bin/svnadmin

SVN=/home/jpieper/svn26/bin/svn
SVNADMIN=/home/jpieper/svn26/bin/svnadmin

mkdir wc
mkdir repo
mkdir orig
touch orig/file1
mkdir branch
mkdir tree
mkdir tree/trunk
mkdir tree/branches
mkdir tree/branches/branch1

${SVNADMIN} create repo
${SVN} import -m"original tree" tree file:///${LPATH}/repo
${SVN} import -m"original files" orig file:///${LPATH}/repo/trunk

cd wc
${SVN} co file:///${LPATH}/repo/trunk .
cd ..
${SVN} -m"new branch" copy file:///${LPATH}/repo/trunk/ file:///${LPATH}/repo/branches/branch1
cd branch
${SVN} co file:///${LPATH}/repo/branches/branch1/trunk .
cd ..

cd wc
touch exec_file
chmod +x exec_file
${SVN} add exec_file
${SVN} ci -m"added executable file"
cd ..
cd branch

${SVN} merge --dry-run -r2:HEAD file:///${LPATH}/repo/trunk