changeset 1624:76f8f0814e1e live

Use --check to avoid errors when updating in repos with more than one head
author Chris Cannam
date Fri, 10 Aug 2018 16:08:05 +0100
parents 8bc0cee5d93f
children 44cbe9fa0b4e
files extra/soundsoftware/extract-docs.sh
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/extra/soundsoftware/extract-docs.sh	Fri Aug 10 12:21:05 2018 +0100
+++ b/extra/soundsoftware/extract-docs.sh	Fri Aug 10 16:08:05 2018 +0100
@@ -84,7 +84,7 @@
 
     if [ -d "$projectdir" ] && [ -d "$projectdir/.hg" ]; then
 
-	if ! sudo -u www-data hg -R "$projectdir" -q update; then
+	if ! sudo -u www-data hg -R "$projectdir" -q update --check; then
 	    echo "Failed to update Hg in $projectdir, skipping" 1>&2
 	    continue
 	fi