comparison tests/test-evolve-obshistory.t @ 2929:06844693bb21

tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 462adae9fea7
children 54f7b8fcdf3b
comparison
equal deleted inserted replaced
2928:6275808e89ef 2929:06844693bb21
29 $ echo 42 >> A0 29 $ echo 42 >> A0
30 $ hg amend -m "A1 30 $ hg amend -m "A1
31 > 31 >
32 > Better commit message" 32 > Better commit message"
33 $ hg log --hidden -G 33 $ hg log --hidden -G
34 @ changeset: 3:4ae3a4151de9 34 @ changeset: 2:4ae3a4151de9
35 | tag: tip 35 | tag: tip
36 | parent: 0:ea207398892e 36 | parent: 0:ea207398892e
37 | user: test 37 | user: test
38 | date: Thu Jan 01 00:00:00 1970 +0000 38 | date: Thu Jan 01 00:00:00 1970 +0000
39 | summary: A1 39 | summary: A1
40 | 40 |
41 | x changeset: 2:f137d23bb3e1
42 | | user: test
43 | | date: Thu Jan 01 00:00:00 1970 +0000
44 | | obsolete: pruned
45 | | summary: temporary amend commit for 471f378eab4c
46 | |
47 | x changeset: 1:471f378eab4c 41 | x changeset: 1:471f378eab4c
48 |/ user: test 42 |/ user: test
49 | date: Thu Jan 01 00:00:00 1970 +0000 43 | date: Thu Jan 01 00:00:00 1970 +0000
50 | obsolete: rewritten as 4ae3a4151de9 44 | obsolete: rewritten as 4ae3a4151de9
51 | summary: A0 45 | summary: A0
56 summary: ROOT 50 summary: ROOT
57 51
58 Actual test 52 Actual test
59 ----------- 53 -----------
60 $ hg obslog --patch 4ae3a4151de9 54 $ hg obslog --patch 4ae3a4151de9
61 @ 4ae3a4151de9 (3) A1 55 @ 4ae3a4151de9 (2) A1
62 | 56 |
63 x 471f378eab4c (1) A0 57 x 471f378eab4c (1) A0
64 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) 58 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
65 --- a/471f378eab4c-changeset-description 59 --- a/471f378eab4c-changeset-description
66 +++ b/4ae3a4151de9-changeset-description 60 +++ b/4ae3a4151de9-changeset-description
81 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool 75 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
82 [ 76 [
83 { 77 {
84 "debugobshistory.markers": [], 78 "debugobshistory.markers": [],
85 "debugobshistory.node": "4ae3a4151de9", 79 "debugobshistory.node": "4ae3a4151de9",
86 "debugobshistory.rev": 3, 80 "debugobshistory.rev": 2,
87 "debugobshistory.shortdescription": "A1" 81 "debugobshistory.shortdescription": "A1"
88 }, 82 },
89 { 83 {
90 "debugobshistory.markers": [ 84 "debugobshistory.markers": [
91 { 85 {