Mercurial > hgsubversion

diff tests/fixtures/replace_branch_with_branch.sh @ 582:44c56a7727c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
editor: fix issamefile() and copy detection in replay mode Known failures: - comprehensive/test_verify on replace_branch_with_branch: replaced files content is incorrect - comprehensive/test_stupid_pull on replace_branch_with_branch: very stupid mode does not handle replacements correctly.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 02 Mar 2010 17:06:06 +0100
parents
children c06f59441f8e
line wrap: on
line diff
new file mode 100755
--- /dev/null
+++ b/tests/fixtures/replace_branch_with_branch.sh
@@ -0,0 +1,45 @@
+#!/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
+svn add branches/branch1/b branches/branch1/d
+svn ci -m 'add b to branch1'
+svn cp trunk branches/branch2
+svn ci -m 'branch2'
+svn up
+echo c > branches/branch2/c
+svn add branches/branch2/c
+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
+EOF
+
+python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn
+
+svnadmin dump repo > ../replace_branch_with_branch.svndump