Mercurial > hg

comparison tests/test-rebase-legacy.t @ 45110:503d0dd2af18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: avoid "magic" nodeids in test-rebase-legacy.t This helps with readability. Differential Revision: https://phab.mercurial-scm.org/D8735
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 13 Dec 2019 22:20:03 -0800
parents 35ebdbb38efb
children f90a5c211251
comparison
equal deleted inserted replaced
45109:b1507ab0c6cf 45110:503d0dd2af18
24 > | | 24 > | |
25 > Z A E 25 > Z A E
26 > \|/ 26 > \|/
27 > R 27 > R
28 > EOF 28 > EOF
29 $ for r in A B C D E F G H R Z
30 > do
31 > eval node_$r=$(hg log -r $r -T '{node}')
32 > done
29 33
30 rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z" 34 rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z"
31 35
32 $ touch .hg/last-message.txt 36 $ touch .hg/last-message.txt
33 $ cat > .hg/rebasestate <<EOF 37 $ cat > .hg/rebasestate <<EOF
34 > 0000000000000000000000000000000000000000 38 > 0000000000000000000000000000000000000000
35 > f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f 39 > $node_Z
36 > 0000000000000000000000000000000000000000 40 > 0000000000000000000000000000000000000000
37 > 0 41 > 0
38 > 0 42 > 0
39 > 0 43 > 0
40 > 44 >
41 > 21a6c45028857f500f56ae84fbf40689c429305b:-2 45 > $node_A:-2
42 > de008c61a447fcfd93f808ef527d933a84048ce7:0000000000000000000000000000000000000000 46 > $node_E:0000000000000000000000000000000000000000
43 > c1e6b162678d07d0b204e5c8267d51b4e03b633c:0000000000000000000000000000000000000000 47 > $node_B:0000000000000000000000000000000000000000
44 > aeba276fcb7df8e10153a07ee728d5540693f5aa:-3 48 > $node_F:-3
45 > bd5548558fcf354d37613005737a143871bf3723:-3 49 > $node_C:-3
46 > d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000 50 > $node_G:0000000000000000000000000000000000000000
47 > 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000 51 > $node_D:0000000000000000000000000000000000000000
48 > 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000 52 > $node_H:0000000000000000000000000000000000000000
49 > EOF 53 > EOF
50 54
51 #if continuecommand 55 #if continuecommand
52 $ hg continue --dry-run 56 $ hg continue --dry-run
53 rebase in progress, will be resumed 57 rebase in progress, will be resumed