Mercurial > hgsubversion
view tests/fixtures/siblingbranchfix.sh @ 1170:61d4fb78370b stable
pull: fix pull when phases.new-commit=secret
This was causing subtle failures during pull. I believe the line where
we manually "set phase to public" isn't required any more, but more
work is required to verify that behavior on all versions of hg, so
we'll do that as a followup on default if needed.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 04 Apr 2014 21:27:55 -0400 |
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