Mercurial > hgsubversion
view tests/fixtures/delete_restore_trunk.sh @ 1055:2d7398fffd0d
push: obsolete rather than rebase & strip when enabled
This requires a few changes to wrappers.push() to use obsolescence
rather than strip and to make the rebase -- which is non-destructive
with obsolete active -- to no longer keep the originals. Possible
future work involves no longer relying on rebase for non-outgoing
revisions, and simply leaving them in the troubled state.
We test this feature by adding setting obsolete_mode_tests to True in
classes that push changes.
| author | Dan Villiom Podlaski Christiansen <dan@cabo.dk> |
|---|---|
| date | Fri, 09 Aug 2013 19:30:25 +0200 |
| 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