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.

#!/bin/sh
mkdir temp || exit 1
cd temp
svnadmin create repo
svn co file://`pwd`/repo wc
pushd wc
mkdir -p project/trunk
svn add project
svn ci -m 'trunk'
cd project/trunk
echo a > a
mkdir narf
svn add a narf
svn ci -m 'file and empty dir'
popd
svnadmin dump repo > ../empty_dir_in_trunk_not_repo_root.svndump
echo 'dump in empty_dir_in_trunk_not_repo_root.svndump'
echo 'you can probably delete temp now'