Mercurial > hgsubversion
view tools/common.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 | 5071b8511572 |
children |
line wrap: on
line source
function verify_current_revision() { /bin/rm -rf * exportcmd="svn export `hg svn info 2> /dev/null | grep '^URL: ' | sed 's/URL: //'`@`hg svn info | grep ^Revision | sed 's/.*: //;s/ .*//'` . --force" `echo $exportcmd` > /dev/null x=$? if [[ "$x" != "0" ]] ; then echo $exportcmd echo 'export failed!' return 255 fi if [[ "`hg st | wc -l | python -c 'import sys; print sys.stdin.read().strip()'`" == "0" ]] ; then return 0 else if [[ $1 != "keep" ]] ; then revert_all_files fi return 1 fi } function revert_all_files() { hg revert --all hg purge }