Mercurial > evolve
diff tests/test-evolve.t @ 1732:f4047fba5e90
templates: change {obsolete} to emit only "obsolete" or ""
The {obsolete} template function can currently emit "stable",
"unstable", "extinct", or "suspended".
The distinction between "extinct" and "suspended" seems likely to be
more confusing that enlightening, and "stable" and "unstable" are not
even obsolete.
Let's simplify it to just emit "obsolete" for obsolete changesets and
"" for others. That will also make it much easier to test for obsolete
changsets and do things like "if(obsolete, obsolete, troubles)".
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 09 Sep 2016 16:42:41 -0700 |
| parents | 7a76f9a43e89 |
| children | 14ace97ffed8 |
line wrap: on
line diff
--- a/tests/test-evolve.t Wed Sep 07 17:51:15 2016 +0200 +++ b/tests/test-evolve.t Fri Sep 09 16:42:41 2016 -0700 @@ -112,13 +112,13 @@ test kill and immutable changeset $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' - 1 public stable + 1 public $ hg prune 1 abort: cannot prune immutable changeset: 7c3bad9141dc (see "hg help phases" for details) [255] $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' - 1 public stable + 1 public test simple kill @@ -694,7 +694,7 @@ (use 'hg resolve' and 'hg graft --continue') [255] $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' - 7:a5bfd90a2f29 stable + 7:a5bfd90a2f29 $ echo 3 > 1 $ hg resolve -m 1 (no more unresolved files)