view tests/fixtures/unrelatedbranch.sh @ 817:3b613d32ef11

svnexternals: fix subrepo peg revision handling (7ef125fa9b35) hg >= 1.9 appends the revision to check out as a peg revision to source URL before calling svn. This breaks the case where the external definition already contains a peg revision. Instead, we assume that "-rR1 svnurl@R2" is equivalent to "svnurl@R1" which should be almost always true in practice. The import test has been reversed to avoid issues with stray .pyc: if you install an hg 1.8 over an hg 1.9, scmutil.pyc may remain and be imported, while util.py exists in both cases.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 06 Jul 2011 10:22:32 +0200
parents ea65fe2b0856
children
line wrap: on
line source

#!/bin/sh
#
# Generate unrelatedbranch.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
echo a > a
svn add a
svn ci -m "add a in trunk"
cd ../branches
# Create an unrelated branch with another file. It used to lead the converter
# to think branch1 was a copy of trunk, even without copy information.
mkdir branch1
echo b > branch1/b
svn add branch1
svn ci -m "add b in branch1"
# Make a real branch too for comparison
svn cp ../trunk branch2
echo b > branch2/b
svn add branch2/b
svn ci -m "add b to branch2"
# Add a file in the branch root for fun
echo c > c
svn add c
svn ci -m "add c in branches/"
# Even update it
echo c >> c
svn ci -m "change c"
cd ../..

svnadmin dump testrepo > ../unrelatedbranch.svndump