Mercurial > evolve

comparison tests/test-issue-5720.t @ 3936:537fd9a86c06 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:22:50 +0200
parents a77fb9669e99 d00f0c369bc7
children
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
43 $ hg prev 43 $ hg prev
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
45 [1] b 45 [1] b
46 $ echo b2 > a 46 $ echo b2 > a
47 $ hg amend 47 $ hg amend
48 1 new orphan changesets 48 1 new unstable changesets
49 $ hg log -G -T "{rev}: {phase}" 49 $ hg log -G -T "{rev}: {phase}"
50 @ 3: draft 50 @ 4: draft
51 | 51 |
52 | o 2: secret 52 | o 2: secret
53 | | 53 | |
54 | x 1: draft 54 | x 1: draft
55 |/ 55 |/
56 o 0: draft 56 o 0: draft
57 57
58 Evolve which triggers a conflict 58 Evolve which triggers a conflict
59 $ hg evolve 59 $ hg evolve
60 move:[2] c 60 move:[2] c
61 atop:[3] b 61 atop:[4] b
62 merging a 62 merging a
63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
64 fix conflicts and see `hg help evolve.interrupted` 64 fix conflicts and see `hg help evolve.interrupted`
65 [1] 65 [1]
66 66
75 evolving 2:13833940840c "c" 75 evolving 2:13833940840c "c"
76 working directory is now at 3d2080c198e5 76 working directory is now at 3d2080c198e5
77 77
78 Tip should stay in secret phase 78 Tip should stay in secret phase
79 $ hg log -G -T "{rev}: {phase}" 79 $ hg log -G -T "{rev}: {phase}"
80 @ 4: secret 80 @ 5: secret
81 | 81 |
82 o 3: draft 82 o 4: draft
83 | 83 |
84 o 0: draft 84 o 0: draft
85 85
86 $ hg log -r . -T '{phase}\n' 86 $ hg log -r . -T '{phase}\n'
87 secret 87 secret