Mercurial > hgsubversion
view tests/fixtures/branch_rename_to_trunk.sh @ 1011:cc774e975aed
commit: fix exception handling on transaction close
On SVN 1.6 at least, a failing pre-commit hook appears to abort a
commit transaction without us needing to do it manually. This is
apparently managed by a callback at the end of SVN's internal commit
callback chain.
Subsequently trying to abort an already-aborted transaction results in
a spurious "Transaction cleanup failed" message that breaks tests.
To fix this, we simply move the commit call out of try/except block.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 23 May 2013 19:23:02 -0500 |
| parents | 2242dd1163c6 |
| children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir branches trunk tags svn add * svn ci -m 'btt' cd trunk for a in alpha beta gamma delta ; do echo $a > $a svn add $a done svn ci -m 'Add files.' cd .. svn up svn cp trunk branches/dev_branch svn ci -m 'branch' cd branches/dev_branch svn rm delta echo narf > alpha echo iota > iota svn add iota svn ci -m 'branch changes' cd ../.. svn up svn mv trunk branches/old_trunk svn ci -m 'move trunk to a branch' svn up svn mv branches/dev_branch trunk svn ci -m 'move dev to trunk' cd .. cd .. svnadmin dump temp/repo > branch_rename_to_trunk.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in branch_rename_to_trunk.svndump' exit 0