Mercurial > hgsubversion
comparison tests/fixtures/revert.sh @ 952:9c3b4f59e7e6
stupid: do not close branch upon branch-wide revert
Reverting a branch with a remove followed by a copy results in a branch
replacement. By default, branch replacements are handled by closing the
replaced branch and committing the new branch on top of it. But we do
not really want that when reverting a branch, we only want a linear
history with a changeset capturing the revert.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Tue, 16 Oct 2012 21:17:55 +0200 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 951:bd9c292665fd | 952:9c3b4f59e7e6 |
|---|---|
| 1 #!/bin/sh | |
| 2 # | |
| 3 # Generate revert.svndump | |
| 4 # | |
| 5 | |
| 6 rm -rf temp | |
| 7 mkdir temp | |
| 8 cd temp | |
| 9 mkdir -p import/trunk/dir | |
| 10 cd import/trunk | |
| 11 echo a > a | |
| 12 echo b > dir/b | |
| 13 cd ../.. | |
| 14 | |
| 15 svnadmin create testrepo | |
| 16 svnurl=file://`pwd`/testrepo | |
| 17 svn import import $svnurl -m init | |
| 18 | |
| 19 svn co $svnurl project | |
| 20 cd project | |
| 21 echo a >> trunk/a | |
| 22 echo b >> trunk/dir/b | |
| 23 svn ci -m changefiles | |
| 24 svn up | |
| 25 # Test directory revert | |
| 26 svn rm trunk | |
| 27 svn cp $svnurl/trunk@1 trunk | |
| 28 svn st | |
| 29 svn ci -m revert | |
| 30 svn up | |
| 31 # Test file revert | |
| 32 svn rm trunk/a | |
| 33 svn rm trunk/dir/b | |
| 34 svn cp $svnurl/trunk/a@2 trunk/a | |
| 35 svn cp $svnurl/trunk/dir/b@2 trunk/dir/b | |
| 36 svn ci -m revert2 | |
| 37 cd .. | |
| 38 | |
| 39 svnadmin dump testrepo > ../revert.svndump |