view tests/fixtures/unrelatedbranch.sh @ 1099:c6f7a8cfeca9

pull: correctly handle replacing the root of a branch with a non-copied directory Prior to this diff, we would either crash, or continue past the replacement without actually recording the change. This could lead to later failing varify if the state before and after weren't identical.
author David Schleimer <dschleimer@fb.com>
date Sat, 16 Nov 2013 16:16:59 -0800
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