# HG changeset patch # User Augie Fackler # Date 1243872632 18000 # Node ID 5071b8511572f1a0ab28ed63ebc6aeccf99f298b # Parent f6050c4dde31a496ff3385504ac9b9fb1cf27269 tools: Fixes for verification that seemed to be needed. diff --git a/tools/common.sh b/tools/common.sh --- a/tools/common.sh +++ b/tools/common.sh @@ -1,7 +1,7 @@ function verify_current_revision() { /bin/rm -rf * - exportcmd="svn export `hg svn info 2> /dev/null | grep '^URL: ' | sed 's/URL: //'` -r`hg svn info | grep ^Revision | sed 's/.*: //;s/ .*//'` . --force" + 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 diff --git a/tools/verify-all-heads.sh b/tools/verify-all-heads.sh --- a/tools/verify-all-heads.sh +++ b/tools/verify-all-heads.sh @@ -4,6 +4,7 @@ for b in `hg branches -a | cut -f 1 -d ' ' | grep -v closed-branches` ; do hg co $b || break echo Verifying $b - verify_current_revision keep > /dev/null || break - echo $b Verified. + verify_current_revision keep > /dev/null && \ + echo $b verified. || \ + (echo $b failed. && /bin/rm -rf * && hg up -C $b) done