Mercurial > hgsubversion
view tests/fixtures/mergeexternals.sh @ 1086:b746d455f0e1
stupid: kill some dead and no longer needed code
While I was debugging an unrelated issue with stupid, some of the code
in branches_in_paths confused me, since it was using an undeclared
variable. It looked like an attempt to short-circuit the
file/directory detection before talking to subversion that never quite
got finished. The code is mostly unreachable, and obviously broken,
so I cleaned it up. I also cleaned up some prepatory code that was
getting executed but appeared to only be useful for the
short-circuintg attempt.
| author | David Schleimer <dschleimer@fb.com> |
|---|---|
| date | Wed, 04 Sep 2013 11:20:44 -0700 |
| 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