Mercurial > hgsubversion
view tests/fixtures/branch_rename_to_trunk.sh @ 1036:e775ffbcb359
push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS
Subversion differentiates adding an already-added file from
transaction being out of date and edit conflicts. Fixes #400.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 16 Jul 2013 10:09:55 -0400 |
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