Mercurial > hgsubversion
view tests/fixtures/mergeexternals.sh @ 822:033b86e0f56d
stupid/filemap: disable this since it doesn't currently work
hg 1.9 dramatically cleaned up patch application, but unfortunately
this breaks stupid mode with filemaps. In the name of getting a
release out the door, disabling this feature for now. There will be
changes required in hg to make this work again, so we may just drop
the feature entirely if nobody's interested.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Fri, 30 Sep 2011 17:01:35 -0500 |
parents | ba65c0b01d4f |
children |
line wrap: on
line source
#!/bin/sh # # Generate mergeexternals.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 mkdir d1 echo a > d1/a mkdir d2 echo b > d2/b mkdir -p common/ext echo c > common/ext/c svn add d1 d2 common svn ci -m addfiles svn up svn propset svn:externals '^/trunk/common/ext ext' d1 svn propset svn:externals '^/trunk/common/ext ext' d2 svn ci -m addexternals cd .. svn up svn cp trunk branches/branch cd branches svn ci -m addbranch cd branch mkdir d3 echo d > d3/d svn add d3 svn propset svn:externals '^/trunk/common/ext ext3' d3 svn ci -m touchbranch cd ../../trunk svn merge '^/branches/branch' svn up svn ci -m 'merge' cd ../.. svnadmin dump testrepo > ../mergeexternals.svndump