#!/bin/sh set -e # A simplified version of test 33 in merge_tests.py. # The 'make install' target. PATH=/tmp/steve/collabnet-ci-prefix/bin:$PATH echo `which svn` rm -rf /tmp/del-w-hist mkdir /tmp/del-w-hist repo=/tmp/del-w-hist/repo wc=/tmp/del-w-hist/wc svnadmin create $repo svn co file://$repo $wc # Create dir A/X. mkdir $wc/A mkdir $wc/A/X echo "foo text" > $wc/A/X/foo svn add $wc/A svn ci $wc -m "init A" # Replace A/X without history. svn del $wc/A/X echo "bar text" > $wc/A/X/bar svn add $wc/A/X svn st -vuq $wc/A # Commit deletes foo implicitly. svn ci $wc -m "replace A/X" # Create dir B/X. mkdir $wc/B mkdir $wc/B/X echo "foo text" > $wc/B/X/foo svn add $wc/B svn ci $wc -m "init B" # Replace B/X with history via 'svn merge'. svn merge file://$repo/A -r1:2 $wc/B # Now foo has status "deleted-with-history", whatever that means. svn st -vuq $wc/B # Commit deletes foo explicitly, after deleting parent. # Is that necessary? svn ci $wc -m "replace B/X via merge"