Mercurial > evolve
comparison tests/test-touch.t @ 2289:61d073590fb7
ui: add better messages when the working copy become obsolete.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 28 Apr 2017 16:57:41 +0200 |
parents | 9f42f819267b |
children | 66796d7b5415 |
comparison
equal
deleted
inserted
replaced
2288:b6ea9049693d | 2289:61d073590fb7 |
---|---|
31 $ echo A > b | 31 $ echo A > b |
32 $ hg add b | 32 $ hg add b |
33 $ hg commit -m ab --amend | 33 $ hg commit -m ab --amend |
34 $ hg up --hidden 1 | 34 $ hg up --hidden 1 |
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
36 working directory parent is obsolete! | 36 working directory parent is obsolete! (*) (glob) |
37 (use 'hg evolve' to update to its successor) | 37 (use 'hg evolve' to update to its successor: *) (glob) |
38 $ hg log -G | 38 $ hg log -G |
39 o 3:[0-9a-f]{12} ab (re) | 39 o 3:[0-9a-f]{12} ab (re) |
40 | 40 |
41 @ 1:[0-9a-f]{12} a (re) | 41 @ 1:[0-9a-f]{12} a (re) |
42 | 42 |