--- a/tests/test-evolve-obshistory.t Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-obshistory.t Fri Oct 20 18:34:22 2017 +0200
@@ -41,13 +41,11 @@
| x changeset: 2:f137d23bb3e1
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: pruned
| | summary: temporary amend commit for 471f378eab4c
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -82,7 +80,7 @@
$ hg obslog --no-graph --patch 4ae3a4151de9
4ae3a4151de9 (3) A1
471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
--- a/471f378eab4c-changeset-description
+++ b/4ae3a4151de9-changeset-description
@@ -1,1 +1,3 @@
@@ -102,7 +100,7 @@
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
@ A1
|
- x A0 at 0 0 by test
+ x A0 at * by test (glob)
$ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
[
@@ -225,7 +223,6 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: pruned
| summary: B0
|
@ changeset: 1:471f378eab4c
@@ -365,7 +362,6 @@
| x changeset: 1:471597cad322
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 337fec4d2edc, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -619,7 +615,6 @@
| x changeset: 1:de7290d8b885
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -795,13 +790,11 @@
| x changeset: 2:0dec01379d3b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as eb5a0daa2192
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1002,7 +995,6 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1035,8 +1027,6 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
- | obsolete: reworded as 65b757b745b9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1318,7 +1308,6 @@
| x changeset: 2:0dec01379d3b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as b7ea6d14e664
| summary: B0
|
o changeset: 1:471f378eab4c
@@ -1346,19 +1335,16 @@
| | parent: 1:471f378eab4c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as eb5a0daa2192
| | summary: B1
| |
| | x changeset: 2:0dec01379d3b
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: reworded as b7ea6d14e664
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1582,13 +1568,11 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as 7a230b46bf61
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1629,7 +1613,6 @@
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers
- obsoleted 1 changesets
(run 'hg heads' to see heads, 'hg merge' to merge)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: 7a230b46bf61)