--- a/tests/test-evolve-obshistory.t Tue May 22 15:40:29 2018 +0200
+++ b/tests/test-evolve-obshistory.t Tue May 22 17:37:40 2018 +0200
@@ -23,109 +23,6 @@
abort: working directory revision cannot be specified
[255]
-Test output with pruned commit
-==============================
-
-Test setup
-----------
-
- $ hg init $TESTTMP/local-prune
- $ cd $TESTTMP/local-prune
- $ mkcommit ROOT
- $ mkcommit A0 # 0
- $ mkcommit B0 # 1
- $ hg log --hidden -G
- @ changeset: 2:0dec01379d3b
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: B0
- |
- o changeset: 1:471f378eab4c
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: A0
- |
- o changeset: 0:ea207398892e
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: ROOT
-
- $ hg prune -r 'desc(B0)'
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- working directory now at 471f378eab4c
- 1 changesets pruned
- $ hg log --hidden -G
- x changeset: 2:0dec01379d3b
- | tag: tip
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: pruned using prune
- | summary: B0
- |
- @ changeset: 1:471f378eab4c
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | summary: A0
- |
- o changeset: 0:ea207398892e
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: ROOT
-
-
-Actual test
------------
-
- $ hg obslog 'desc(B0)' --hidden --patch
- x 0dec01379d3b (2) B0
- pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
- (No patch available, no successors)
-
- $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
- [
- {
- "markers": [
- {
- "date": [
- *, (glob)
- 0 (glob)
- ],
- "operation": "prune",
- "user": "test",
- "verb": "pruned"
- }
- ],
- "node": "0dec01379d3b",
- "rev": 2,
- "shortdescription": "B0"
- }
- ]
- $ hg obslog 'desc(A0)' --patch
- @ 471f378eab4c (1) A0
-
- $ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool
- [
- {
- "markers": [],
- "node": "471f378eab4c",
- "rev": 1,
- "shortdescription": "A0"
- }
- ]
- $ hg up 1
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg up 0dec01379d3b
- abort: hidden revision '0dec01379d3b' is pruned!
- (use --hidden to access hidden revisions)
- [255]
- $ hg up --hidden -r 'desc(B0)'
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- updated to hidden changeset 0dec01379d3b
- (hidden revision '0dec01379d3b' is pruned)
- working directory parent is obsolete! (0dec01379d3b)
- (use 'hg evolve' to update to its parent successor)
-
Test output with splitted commit
================================