layouts: consistently return None for default branch This makes the single and standard layouts consistent in what they return for the default branch. Previously, single had returned 'default' now they both return None. In addition, this fixes a now-exposed bug in stupid's convert_revision logic. Specifically, when a file is replaced by another file within the same branch, we treated that as replacing the entire branch. this bug was previously hidden because meta.split_branch_path and meta.localname were inconsistent in what they returned for the single layout. meta.split-branch_path is used to maintain the set of known branches, where meta.localname is used to determine the branch for the path being replaced. This resulted in erroneously hitting the condition that skipped paths outside branches we know about when considering replace operations from svn.

#!/bin/sh
#
# Generate revert.svndump
#

rm -rf temp
mkdir temp
cd temp
mkdir -p import/trunk/dir
cd import/trunk
echo a > a
echo b > dir/b
cd ../..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import import $svnurl -m init

svn co $svnurl project
cd project
echo a >> trunk/a
echo b >> trunk/dir/b
svn ci -m changefiles
svn up
# Test directory revert
svn rm trunk
svn cp $svnurl/trunk@1 trunk
svn st
svn ci -m revert
svn up
# Test file revert
svn rm trunk/a
svn rm trunk/dir/b
svn cp $svnurl/trunk/a@2 trunk/a
svn cp $svnurl/trunk/dir/b@2 trunk/dir/b
svn ci -m revert2
cd ..

svnadmin dump testrepo > ../revert.svndump