#!/usr/local/bin/bash

echo "* Removing old directories"
# Cleanup
rm -rf test3
mkdir test3
cd test3

BASE=`pwd`

# Create repo
svnadmin create repo
export URL=file://`pwd`/repo
export TRUNK=$URL/trunk
export A=$URL/branches/a

svn co $URL $BASE/wc
cd $BASE/wc
mkdir -p trunk branches tags
echo "initial line" > trunk/foo.c
echo "initial line" > trunk/bar.c
svn add *
svn ci -m "Initial import"

svn cp trunk branches/a
svn ci -m "Create branch a"

cd $BASE/wc/branches/a
svn up
svn merge $TRUNK
svn ci -m "Initial empty merge from trunk"

cd $BASE/wc/trunk
echo "new line" >> foo.c
echo "new line" >> bar.c
svn ci -m "add new line to foo.c and bar.c on branch a"

cd $BASE/wc/branches/a
svn merge --accept mine-full $TRUNK/foo.c
svn ci -m "merge foo.c from trunk"

echo "mergeinfo after merge of foo.c"
svn pl -vR .

svn merge $TRUNK
svn ci -m "full merge from trunk without update"

echo "mergeinfo after full merge from trunk"
svn pl -vR .

svn up
svn merge $TRUNK
svn ci -m "full merge from trunk after update"

echo "mergeinfo full merge from trunk after update"
svn pl -vR .