Mercurial > hgsubversion
comparison tests/fixtures/replace_branch_with_branch.sh @ 582:44c56a7727c4
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 |
comparison
equal
deleted
inserted
replaced
| 581:90efea2c19df | 582:44c56a7727c4 |
|---|---|
| 1 #!/bin/sh | |
| 2 | |
| 3 RSVN="`pwd`/rsvn.py" | |
| 4 export PATH=/bin:/usr/bin | |
| 5 mkdir temp | |
| 6 cd temp | |
| 7 | |
| 8 svnadmin create repo | |
| 9 svn co file://`pwd`/repo wc | |
| 10 | |
| 11 cd wc | |
| 12 mkdir trunk branches | |
| 13 cd trunk | |
| 14 echo a > a | |
| 15 cd .. | |
| 16 svn add * | |
| 17 svn ci -m 'initial' | |
| 18 | |
| 19 svn up | |
| 20 svn cp trunk branches/branch1 | |
| 21 svn ci -m 'branch1' | |
| 22 svn up | |
| 23 echo b > branches/branch1/b | |
| 24 echo d > branches/branch1/d | |
| 25 svn add branches/branch1/b branches/branch1/d | |
| 26 svn ci -m 'add b to branch1' | |
| 27 svn cp trunk branches/branch2 | |
| 28 svn ci -m 'branch2' | |
| 29 svn up | |
| 30 echo c > branches/branch2/c | |
| 31 svn add branches/branch2/c | |
| 32 svn ci -m 'add c to branch2' | |
| 33 svn up | |
| 34 | |
| 35 # Clobber branch1 with branch2 | |
| 36 cd .. | |
| 37 cat > clobber.rsvn <<EOF | |
| 38 rdelete branches/branch1 | |
| 39 rcopy branches/branch2 branches/branch1 | |
| 40 rcopy branches/branch1/d branches/branch1/a | |
| 41 EOF | |
| 42 | |
| 43 python $RSVN --message=blah --username=evil `pwd`/repo < clobber.rsvn | |
| 44 | |
| 45 svnadmin dump repo > ../replace_branch_with_branch.svndump |