#!/bin/sh

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

svnadmin create --fs-type=fsfs $REPOS

# Import the directories
mkdir import
cd import
mkdir tags trunk
svn import -m 'initial import' . $REPOS_URL
cd ..

# Create the two tags
svn co $REPOS_URL/tags
cd tags
mkdir -p base
mkdir -p tag/dir1
touch tag/dir1/file1
svn add base tag
svn commit -m 'added dirs'
cd ..

# Checkout from the trunk and do the merge
svn co $REPOS_URL/trunk
cd trunk
mkdir dir1
svn merge $REPOS_URL/tags/base@HEAD $REPOS_URL/tags/tag@HEAD
svn commit -m 'commit after merge'