Mercurial > hgsubversion
view tests/fixtures/siblingbranchfix.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 | 41c333473dda |
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 echo a > a svn add a svn ci -m 'Add file.' svn up cd .. svn cp trunk wrongbranch svn ci -m 'Branch to repo root dir.' svn up svn mv wrongbranch branches/wrongbranch svn ci -m 'Move branch to correct branches location' svn up cd ../.. svnadmin dump temp/repo > siblingbranchfix.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in siblingbranchfix.svndump' exit 0