#/bin/bash
set -x
D=/tmp/merge_1_1_DD_1
if [ -x $D ]; then
  rm -rf $D
fi
mkdir $D
cd $D

R=$D/repository
svnadmin create $R

W=$D/wc
svn co file://$R $W

cd $W

I=incoming

DD=D1/D2
mkdir -p $I/$DD

svn add $I
svn ci -m "initial state"

L=local
svn cp $I $L
svn up

# incoming changes
E=$DD/epsilon
echo "new file epsilon" > $I/$E
svn add $I/$E
svn ci -m "incoming changes"

# local changes
svn rm $L/D1
svn ci -m "local changes"

# boom.
svn merge -r 1:3 file://$R/$I $L

svn status