Mercurial > hgsubversion
view tests/fixtures/unorderedbranch.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 | 4d42dbbb5127 |
children |
line wrap: on
line source
#!/bin/sh # # Generate unorderedbranch.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk mkdir branches cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" svn co $svnurl project cd project/trunk echo a > a svn add a svn ci -m "add a in trunk" echo b > b echo z > z svn add b z svn ci -m "add b and z in trunk" svn up cd ../branches # Copy from trunk past revision. The converted used to take the last # trunk revision as branch parent instead of the specified one. svn cp -r 2 ../trunk branch svn cp ../trunk/z branch echo c > branch/c svn add branch/c svn ci -m 'branch and add c' cd ../.. svnadmin dump testrepo > ../unorderedbranch.svndump