Mercurial > hgsubversion
view tests/fixtures/replace_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 | 22162380c4b9 |
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 for a in alpha beta gamma ; do echo $a > $a done cd .. svn add * svn ci -m 'initial' svn up svn cp trunk branches/test svn ci -m 'branch' svn up echo foo >> branches/test/alpha svn ci -m 'Mod.' cd .. echo rdelete trunk > tmp echo rcopy branches/test trunk >> tmp python $RSVN --message=blah --username=evil `pwd`/repo < tmp svnadmin dump repo > ../replace_trunk_with_branch.svndump