Mercurial > evolve
diff tests/test-drop.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 | 87b83a3e0392 |
children | 9c9c8c1eeb93 9f900937c198 |
line wrap: on
line diff
--- a/tests/test-drop.t Fri Oct 20 16:07:40 2017 +0200 +++ b/tests/test-drop.t Fri Oct 20 19:32:18 2017 +0200 @@ -178,7 +178,7 @@ $ hg commit --amend $ summary ============ graph ============== - @ changeset: 3:a2c06c884bfe + @ changeset: 4:a2c06c884bfe | tag: tip | parent: 1:19509a42b0d0 | user: test @@ -196,13 +196,19 @@ summary: add base ============ hidden ============= - @ changeset: 3:a2c06c884bfe + @ changeset: 4:a2c06c884bfe | tag: tip | parent: 1:19509a42b0d0 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add child | + | x changeset: 3:87ea30a976fd + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | obsolete: pruned + | | summary: temporary amend commit for 34b6c051bf1f + | | | x changeset: 2:34b6c051bf1f |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -221,6 +227,7 @@ ============ obsmark ============ 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'ef1': '*', 'user': 'test'} (glob) + 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '*', 'user': 'test'} (glob) $ hg drop . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 19509a42b0d0