Mercurial > evolve

comparison tests/test-topic-stack-complex.t @ 4784:ecf0f3bc7468 mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 14:43:17 +0200
parents 3ef4980353af ff452675566c
children 308c1e09f80f
comparison
equal deleted inserted replaced
4783:5d50f3de4714 4784:ecf0f3bc7468
144 move:[s4] Added e and f 144 move:[s4] Added e and f
145 $ hg up s4 145 $ hg up s4
146 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 146 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
147 $ hg id -r . 147 $ hg id -r .
148 ec94a1ed1330 tip 148 ec94a1ed1330 tip
149 $ hg up --hidden 'min(predecessors(.))' 149 $ hg up --hidden 'min(precursors(.))'
150 updating to a hidden changeset f1d3649d6a8b
151 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330)
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
151 updated to hidden changeset f1d3649d6a8b
152 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330)
153 working directory parent is obsolete! (f1d3649d6a8b) 153 working directory parent is obsolete! (f1d3649d6a8b)
154 (use 'hg evolve' to update to its successor: ec94a1ed1330) 154 (use 'hg evolve' to update to its successor: ec94a1ed1330)
155 $ hg amend -d '0 1' 155 $ hg amend -d '0 1'
156 1 new orphan changesets 156 1 new orphan changesets
157 2 new content-divergent changesets 157 2 new content-divergent changesets