view tests/fixtures/mergeexternals.sh @ 831:be5bbb2f2d68

svnrepo: kludge to work around hash changes between stupid and replay in hg 1.9 This causes every commit to get a new manifest, just like hg 1.8 and earlier. It also fixes some problems where stupid and replay produced different hashes under 1.9, which is the primary motivation for preserving the old behavior. Hopefully some day we can back this out and be smarter about stupid mode, or can stupid mode entirely in favor of some smarter validations in 'hg svn verify'.
author Augie Fackler <durin42@gmail.com>
date Mon, 10 Oct 2011 22:03:13 -0500
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