view tests/fixtures/renamedproject.sh @ 628:4375d37fea1e

svnrepo: fix issue 187: ignore pushable bookmarks in hg 1.6 Mercurial 1.6 introduces two new methods for repo subclasses -- pushkey and listkeys -- to support pushing/pulling bookmarks between hg repositories. (See mpm's blog post http://www.selenic.com/blog/?p=644 for details.) Unfortunately, these are only defined in the subclasses, and not in the repo base class. Perhaps the bookmarks extension should also be checking the repo for pushkeys capability by calling repo.capable('pushkey') to check. It doesn't. In the meantime, we can implement these ourselves. svnrepo should declare these methods since it is derived directly from repo. They do nothing -- listkeys merely returns an empty dictionary; pushkey returns False; this is the behaviour of httprepo or sshrepo when the remote end is running an earlier version of Mercurial. svnlocalrepo should not declare these methods since it derives from a subclass of localrepo, which already will have them, unless some other badly behaved extensions are doing something intensely weird.
author James McKay <code@jamesmckay.net>
date Sun, 04 Jul 2010 18:21:20 +0100
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