view tests/fixtures/unorderedbranch.sh @ 313:942f198b8ff5

hg_delta_editor: detect new branches issued from non-branch directories This fix solves the following case: let's /dumb/layout/project be an existing project. To normalize the trunk/branches/tags layout, people may do: $ mkdir /project $ mv /dumb/layout/project /project/project # Oups, should have been trunk! $ mv /project/project /project/trunk trunk creation was ignore because: - update_branch_map() sees it come from a non-branch copy source and ignores it (case #3). - since it is not in self.branches, add_directory() ignores the non-existing path. Then trunk is left uninitialized. To solve this, we allow update_branch_map() to detect branches copied from non-canonical locations.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 03 May 2009 21:42:42 -0500
parents 4d42dbbb5127
children
line wrap: on
line source

#!/bin/sh
#
# Generate unorderedbranch.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"
echo b > b
echo z > z
svn add b z
svn ci -m "add b and z in trunk"
svn up
cd ../branches
# Copy from trunk past revision. The converted used to take the last
# trunk revision as branch parent instead of the specified one.
svn cp -r 2 ../trunk branch
svn cp ../trunk/z branch
echo c > branch/c
svn add branch/c
svn ci -m 'branch and add c'
cd ../..

svnadmin dump testrepo > ../unorderedbranch.svndump