Mercurial > hgsubversion

view tests/fixtures/replace_branch_with_branch.sh @ 862:6ef6c413d6de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor: work around svn 1.7 closing the output fp in apply_textdelta() Calling close() on the output cStringIO when done with patching prevents us to retrieve the result with getvalue(). Note: I found this bug has been fixed already by 794f3e41ec1e. I feel ignoring the close() call is a little cleaner than storing the value before the handler() call for there is no guarantee the handler does not modify the value in its last call. Looking at text_delta.c, it does not in 1.7.1. So, do what you want with this patch.
author Patrick Mezard <patrick@mezard.eu>
date Thu, 19 Apr 2012 15:08:09 +0200
parents 2723152c8111
children
line wrap: on
line source

#!/bin/sh

RSVN="`pwd`/rsvn.py"
export PATH=/bin:/usr/bin
mkdir temp
cd temp

svnadmin create repo
svn co file://`pwd`/repo wc

cd wc
mkdir trunk branches
cd trunk
echo a > a
cd ..
svn add *
svn ci -m 'initial'

svn up
svn cp trunk branches/branch1
svn ci -m 'branch1'
svn up
echo b > branches/branch1/b
echo d > branches/branch1/d
mkdir branches/branch1/dir
echo e > branches/branch1/dir/e
echo f > branches/branch1/f
echo g > branches/branch1/g
svn add branches/branch1/b branches/branch1/d branches/branch1/dir \
    branches/branch1/f branches/branch1/g
svn ci -m 'add b to branch1'
svn cp trunk branches/branch2
svn ci -m 'branch2'
svn up
echo c > branches/branch2/c
mkdir branches/branch2/dir
echo e2 > branches/branch2/dir/e
echo f2 > branches/branch2/f
svn add branches/branch2/c branches/branch2/dir branches/branch2/f
svn ci -m 'add c to branch2'
svn up

# Clobber branch1 with branch2
cd ..
cat > clobber.rsvn <<EOF
rdelete branches/branch1
rcopy branches/branch2 branches/branch1
rcopy branches/branch1/d branches/branch1/a
rcopy branches/branch1/dir branches/branch1/dir
rcopy branches/branch1/dir branches/branch1/dir2
rcopy branches/branch1/f branches/branch1/f
rcopy branches/branch1/g branches/branch1/g
EOF

python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn

svnadmin dump repo > ../replace_branch_with_branch.svndump