Mercurial > hgsubversion
view tests/fixtures/delete_restore_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 | c4ee11a5d04c |
children |
line wrap: on
line source
#!/bin/bash set -e 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' echo foo > trunk/foo svn add trunk/foo svn ci -m 'add file' svn up svn rm trunk svn ci -m 'delete trunk' svn up cd .. svn cp -m 'restore trunk' file://`pwd`/repo/trunk@2 file://`pwd`/repo/trunk cd wc svn up echo bar >> trunk/foo svn ci -m 'append to file' svn up cd ../.. svnadmin dump temp/repo > delete_restore_trunk.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in branch_delete_parent_dir.svndump' exit 0