Mercurial > evolve

changeset 5080:6db9e2350948 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: shellcheck merge-test-compat.sh
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 20 Jan 2020 22:43:11 +0700
parents 39029a6d33d4
children 17fac26833da
files contrib/merge-test-compat.sh
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/merge-test-compat.sh	Tue Jan 21 23:48:41 2020 +0700
+++ b/contrib/merge-test-compat.sh	Mon Jan 20 22:43:11 2020 +0700
@@ -2,14 +2,12 @@
 set -euox pipefail
 
 unset GREP_OPTIONS
-NOTOPIC="--config experimental.topic-mode=ignore"
 
-compatbranches=`hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse`
+compatbranches=$(hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse)
 prev='stable'
 for branch in $compatbranches; do
-    hg up $branch
-    hg merge $prev
+    hg up "$branch"
+    hg merge "$prev"
     hg commit -m "test-compat: merge $prev into $branch"
     prev=$branch
 done
-