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/bash
#
# Generate branchtagcollision.svndump
#
# Generates an svn repository with a branch and a tag that have the same name.


mkdir temp
cd temp

svnadmin create testrepo
svn checkout file://`pwd`/testrepo client

cd client
mkdir trunk
mkdir branches
mkdir tags

svn add trunk branches tags
svn commit -m "Initial commit"

echo "fileA" >> trunk/fileA
svn add trunk/fileA
svn commit -m "Added fileA"

svn cp trunk branches/A
svn commit -m "added branch"

echo "fileB" >> trunk/fileB
svn add trunk/fileB
svn commit -m "Added fileB"

svn cp trunk tags/A
svn commit -m "added bad tag"

cd ..
svnadmin dump testrepo > ../branchtagcollision.svndump