Mercurial > hgsubversion
view tests/fixtures/unorderedbranch.sh @ 1170:61d4fb78370b stable
pull: fix pull when phases.new-commit=secret
This was causing subtle failures during pull. I believe the line where
we manually "set phase to public" isn't required any more, but more
work is required to verify that behavior on all versions of hg, so
we'll do that as a followup on default if needed.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 04 Apr 2014 21:27:55 -0400 |
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