view tests/fixtures/renamedproject.sh @ 634:a400f3bf5611

replay/stupid: fix tagging on a branch renamed using a branch map Previously, both convert_rev() functions used parentctx.extra() to determine the branch to pass to meta.movetag(). This assumed that the branch name stored in the changeset matches the internal branch. The introduction of branch maps made this assumption unsafe, however: Now, the Mercurial branch can be completely unrelated to the origin of the changeset. It turns out, however, that movetag() already has sufficient knowledge to determine the branch. Given the hash of the new changeset to be tagged, we walk its ancestors until we find an open changeset, which we then know to be the originating branch. This assumes that there were `few' commits made to the tag; an assumption I would consider reasonable.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Sun, 11 Jul 2010 11:46:19 +0200
parents 942f198b8ff5
children
line wrap: on
line source

#!/bin/sh
#
# Convert a project moving from a non-canonical to canonical
# layout, exercizing the missing plaintext code paths. It also tests
# branch creations where the branch source is not a canonical branch.
#

mkdir temp
cd temp

svnadmin create testrepo
svnurl=file://`pwd`/testrepo

mkdir project-orig
cd project-orig
echo a > a
echo b > b
echo c > c
mkdir d
echo a > d/a
cd ..

# Let's suppose it was actually branched in a previous life
mkdir project-branch
cd project-branch
echo a > a
echo b > b
cd ..

svn import project-orig $svnurl/project-orig -m "init project"
svn import project-branch $svnurl/project-branch -m "init branch"

svn mkdir $svnurl/project -m "create new project hierarchy"
svn mv $svnurl/project-orig $svnurl/project/project -m "rename as project"
svn mv $svnurl/project/project $svnurl/project/trunk -m "rename as project"

svn mkdir $svnurl/project/branches -m "add branches root"
svn mv $svnurl/project-branch $svnurl/project/misplaced -m "incorrect move of the branch"
svn mv $svnurl/project/misplaced $svnurl/project/branches/branch -m "move of the branch"

svn co $svnurl/project
cd project
echo a >> trunk/a
svn ci -m "change a"
echo a >> trunk/a
echo b >> trunk/b
svn rm trunk/c
echo a >> trunk/d/a
svn ci -m "change files in trunk"
# Try the same thing with the branch
echo a >> branches/branch/a
svn rm branches/branch/b
svn ci -m "change a in branch"
cd ..

# Add this to make test_rebuildmeta happy, needs something to convert
svn import project-orig $svnurl/trunk -m "init fake trunk for rebuild_meta"

svnadmin dump testrepo > ../renamedproject.svndump