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 movetotrunk.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
cd ..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn mkdir --parents $svnurl/sub1/sub2 -m subpaths
svn import project-orig $svnurl/sub1/sub2 -m "init project"

svn co $svnurl/sub1/sub2 project
cd project
echo a > a
svn add a
mkdir dir
echo b > dir/b
svn add dir
svn ci -m adda
svn up
mkdir trunk
svn add trunk
svn mv a trunk/a
svn mv dir trunk/dir
svn ci -m 'move to trunk'
cd ..

svnadmin dump testrepo > ../movetotrunk.svndump