--- a/tests/test-rebase-legacy.t	Fri Dec 13 22:08:18 2019 -0800
+++ b/tests/test-rebase-legacy.t	Fri Dec 13 22:20:03 2019 -0800
@@ -26,26 +26,30 @@
   >   \|/
   >    R
   > EOF
+  $ for r in A B C D E F G H R Z
+  > do
+  >   eval node_$r=$(hg log -r $r -T '{node}')
+  > done
 
 rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z"
 
   $ touch .hg/last-message.txt
   $ cat > .hg/rebasestate <<EOF
   > 0000000000000000000000000000000000000000
-  > f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f
+  > $node_Z
   > 0000000000000000000000000000000000000000
   > 0
   > 0
   > 0
   > 
-  > 21a6c45028857f500f56ae84fbf40689c429305b:-2
-  > de008c61a447fcfd93f808ef527d933a84048ce7:0000000000000000000000000000000000000000
-  > c1e6b162678d07d0b204e5c8267d51b4e03b633c:0000000000000000000000000000000000000000
-  > aeba276fcb7df8e10153a07ee728d5540693f5aa:-3
-  > bd5548558fcf354d37613005737a143871bf3723:-3
-  > d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000
-  > 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000
-  > 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000
+  > $node_A:-2
+  > $node_E:0000000000000000000000000000000000000000
+  > $node_B:0000000000000000000000000000000000000000
+  > $node_F:-3
+  > $node_C:-3
+  > $node_G:0000000000000000000000000000000000000000
+  > $node_D:0000000000000000000000000000000000000000
+  > $node_H:0000000000000000000000000000000000000000
   > EOF
 
 #if continuecommand