view tests/fixtures/mergeexternals.sh @ 861:6fc7f74f0cf6

stupid: force non-incremental mode for unrelated branches creation Apparently, svn < 1.7 was already taking this path since it could not diff unrelated branches. svn >= 1.7 learnt to do that but supporting it in the regular stupid mode needs some work. Be lazy for now.
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 15:08:07 +0200
parents ba65c0b01d4f
children
line wrap: on
line source

#!/bin/sh
#
# Generate mergeexternals.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir trunk
mkdir branches
cd ..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import project-orig $svnurl -m "init project"

svn co $svnurl project
cd project/trunk
mkdir d1
echo a > d1/a
mkdir d2
echo b > d2/b
mkdir -p common/ext
echo c > common/ext/c
svn add d1 d2 common
svn ci -m addfiles
svn up
svn propset svn:externals '^/trunk/common/ext ext' d1
svn propset svn:externals '^/trunk/common/ext ext' d2
svn ci -m addexternals
cd ..
svn up
svn cp trunk branches/branch
cd branches
svn ci -m addbranch
cd branch
mkdir d3
echo d > d3/d
svn add d3
svn propset svn:externals '^/trunk/common/ext ext3' d3
svn ci -m touchbranch
cd ../../trunk
svn merge '^/branches/branch'
svn up
svn ci -m 'merge'
cd ../..

svnadmin dump testrepo > ../mergeexternals.svndump