Mercurial > hgsubversion
view tests/fixtures/unrelatedbranch.sh @ 950:a80b01ceb1fc
editor: relax copyfrom dir checks to avoid extra missing entries
When renaming a branch you get something like:
D /branch/bar
A /branch/foo (from /branch/foo:42)
Unfortunately, the branch layout for the revision being converted is
computed before starting to convert it. It means the copyfrom path
supplied in the add_directory() for /branch/foo will be be considered
invalid, be added to missing and fetched the slow way despite being in
the repository history. Avoid that by checking the path looks like a
branch path and matching it with the filemap. It will be resolved
afterwards anyway.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sat, 06 Oct 2012 10:10:35 +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