Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 3105:f5d472b7e800 mercurial-4.3
test-compat: revert output changes related to temporary amend commit
This backed out changeset 06844693bb21 and other related changes.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 19:32:18 +0200 |
| parents | ccfcacc5ee7c |
| children | a867d59ea97a |
comparison
equal
deleted
inserted
replaced
| 3104:3dd5a6f83f8b | 3105:f5d472b7e800 |
|---|---|
| 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: 2:4ae3a4151de9 | 34 @ changeset: 3: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 | | | |
| 41 | x changeset: 1:471f378eab4c | 47 | x changeset: 1:471f378eab4c |
| 42 |/ user: test | 48 |/ user: test |
| 43 | date: Thu Jan 01 00:00:00 1970 +0000 | 49 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 44 | obsolete: rewritten as 4ae3a4151de9 | 50 | obsolete: rewritten as 4ae3a4151de9 |
| 45 | summary: A0 | 51 | summary: A0 |
| 50 summary: ROOT | 56 summary: ROOT |
| 51 | 57 |
| 52 Actual test | 58 Actual test |
| 53 ----------- | 59 ----------- |
| 54 $ hg obslog --patch 4ae3a4151de9 | 60 $ hg obslog --patch 4ae3a4151de9 |
| 55 @ 4ae3a4151de9 (2) A1 | 61 @ 4ae3a4151de9 (3) A1 |
| 56 | | 62 | |
| 57 x 471f378eab4c (1) A0 | 63 x 471f378eab4c (1) A0 |
| 58 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) | 64 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
| 59 --- a/471f378eab4c-changeset-description | 65 --- a/471f378eab4c-changeset-description |
| 60 +++ b/4ae3a4151de9-changeset-description | 66 +++ b/4ae3a4151de9-changeset-description |
| 101 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool | 107 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
| 102 [ | 108 [ |
| 103 { | 109 { |
| 104 "markers": [], | 110 "markers": [], |
| 105 "node": "4ae3a4151de9", | 111 "node": "4ae3a4151de9", |
| 106 "rev": 2, | 112 "rev": 3, |
| 107 "shortdescription": "A1" | 113 "shortdescription": "A1" |
| 108 }, | 114 }, |
| 109 { | 115 { |
| 110 "markers": [ | 116 "markers": [ |
| 111 { | 117 { |