Mercurial > hgsubversion
view tests/fixtures/unrelatedbranch.sh @ 819:e30ff6d5feff
Fix import based feature detection
With demandimport, the following:
from mercurial.util import canonpath
creates an 'unloaded module' if canonpath is not a mercurial.util attribute,
instead of raising AttributeError or ImportError, which defeats tests like:
try:
from mercurial.util import canonpath
except (AttributeError, ImportError):
from mercurial.scmutil import canonpath
Instead, we reference the attribute explicitely, making either the modules to
load or to fail loading.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 08 Jul 2011 13:57:30 +0200 |
parents | ea65fe2b0856 |
children |
line wrap: on
line source
#!/bin/sh # # Generate unrelatedbranch.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" cd ../branches # Create an unrelated branch with another file. It used to lead the converter # to think branch1 was a copy of trunk, even without copy information. mkdir branch1 echo b > branch1/b svn add branch1 svn ci -m "add b in branch1" # Make a real branch too for comparison svn cp ../trunk branch2 echo b > branch2/b svn add branch2/b svn ci -m "add b to branch2" # Add a file in the branch root for fun echo c > c svn add c svn ci -m "add c in branches/" # Even update it echo c >> c svn ci -m "change c" cd ../.. svnadmin dump testrepo > ../unrelatedbranch.svndump