comparison tests/test-evolve-templates.t @ 3566:e6bea259c227

prune: include "operation" metadata in obsmarkers
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 12 Mar 2018 15:51:17 -0700
parents 589649021ea1
children 5ddea3b8d2a4
comparison
equal deleted inserted replaced
3565:cfe31185ad07 3566:e6bea259c227
1618 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1618 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1619 working directory parent is obsolete! (471f378eab4c) 1619 working directory parent is obsolete! (471f378eab4c)
1620 (use 'hg evolve' to update to its parent successor) 1620 (use 'hg evolve' to update to its parent successor)
1621 $ hg tlog 1621 $ hg tlog
1622 @ 471f378eab4c 1622 @ 471f378eab4c
1623 | Fate: pruned 1623 | Fate: pruned using prune
1624 | 1624 |
1625 o ea207398892e 1625 o ea207398892e
1626 1626
1627 $ hg fatelog -v 1627 $ hg fatelog -v
1628 @ 471f378eab4c 1628 @ 471f378eab4c
1629 | Obsfate: pruned by test (at 1970-01-01 00:00 +0000) 1629 | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000)
1630 | 1630 |
1631 o ea207398892e 1631 o ea207398892e
1632 1632