Mercurial > hgsubversion
view tests/fixtures/branch_rename_to_trunk.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 | 2242dd1163c6 |
| children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo svn co file://`pwd`/repo wc cd wc mkdir branches trunk tags svn add * svn ci -m 'btt' cd trunk for a in alpha beta gamma delta ; do echo $a > $a svn add $a done svn ci -m 'Add files.' cd .. svn up svn cp trunk branches/dev_branch svn ci -m 'branch' cd branches/dev_branch svn rm delta echo narf > alpha echo iota > iota svn add iota svn ci -m 'branch changes' cd ../.. svn up svn mv trunk branches/old_trunk svn ci -m 'move trunk to a branch' svn up svn mv branches/dev_branch trunk svn ci -m 'move dev to trunk' cd .. cd .. svnadmin dump temp/repo > branch_rename_to_trunk.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in branch_rename_to_trunk.svndump' exit 0