# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1579773706 -3600
# Node ID 17fac26833da5066b007adb524445ad761e6e9b6
# Parent  6db9e235094837e4a6d194c7935a468221124125
contrib: make merge-test-compat.sh more topic-friendly

diff -r 6db9e2350948 -r 17fac26833da contrib/merge-test-compat.sh
--- a/contrib/merge-test-compat.sh	Mon Jan 20 22:43:11 2020 +0700
+++ b/contrib/merge-test-compat.sh	Thu Jan 23 11:01:46 2020 +0100
@@ -5,9 +5,21 @@
 
 compatbranches=$(hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse)
 prev='stable'
+topic=${1:-'test-compat'}
 for branch in $compatbranches; do
-    hg up "$branch"
-    hg merge "$prev"
+    # Logic in the revsets below:
+    # 1. There is target topic on stable or compatibility branch: merge all
+    # those commits, they are related to our work and need to pass tests on all
+    # compatibility branches.
+    # 2. There is no target topic: avoid any commits that have topic set, they
+    # are definitely unrelated to what we're doing.
+    # In other words, if you want to test certain commits, assign them all to
+    # one topic and provide that topic as the first argument to this script.
+    uptarget="first(max(branch('$branch') and topic('$topic')) or max(branch('$branch') and not topic()))"
+    hg up -r "$uptarget"
+    hg topic "$topic"
+    mergetarget="first(max(branch('$prev') and topic('$topic')) or max(branch('$prev') and not topic()))"
+    hg merge -r "$mergetarget"
     hg commit -m "test-compat: merge $prev into $branch"
     prev=$branch
 done