Mercurial > hgsubversion
view tests/fixtures/siblingbranchfix.sh @ 1099:c6f7a8cfeca9
pull: correctly handle replacing the root of a branch with a non-copied directory
Prior to this diff, we would either crash, or continue past the
replacement without actually recording the change. This could lead to
later failing varify if the state before and after weren't identical.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Sat, 16 Nov 2013 16:16:59 -0800 |
parents | 41c333473dda |
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 echo a > a svn add a svn ci -m 'Add file.' svn up cd .. svn cp trunk wrongbranch svn ci -m 'Branch to repo root dir.' svn up svn mv wrongbranch branches/wrongbranch svn ci -m 'Move branch to correct branches location' svn up cd ../.. svnadmin dump temp/repo > siblingbranchfix.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in siblingbranchfix.svndump' exit 0