#!/bin/sh

SVN=svn
REPOS=$PWD/svn.$$
REPOS_URL=file://$REPOS

svnadmin create --fs-type=fsfs $REPOS

# Import the directories
mkdir import
cd import
mkdir branches tags trunk
mkdir -p trunk/dir1/dir2 branches/branch1/dir1/dir2 tags/tag1/dir1/dir2
$SVN import -m 'initial import' . $REPOS_URL
cd ..

# Add a directory and file in the branch
$SVN co $REPOS_URL/branches/branch1
cd branch1/dir1/dir2
mkdir dir3
$SVN add dir3
$SVN commit -m 'added dir3'
cd ../../..

# Checkout from the trunk and do the merge
$SVN co $REPOS_URL/trunk
cd trunk
$SVN merge $REPOS_URL/tags/tag1 $REPOS_URL/branches/branch1