Mercurial > evolve

comparison tests/test-topic-stack-complex.t @ 6007:ee54e02d3ea0 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 Thu, 12 Aug 2021 22:01:17 +0200
parents 0f32359bcf3e
children
comparison
equal deleted inserted replaced
6006:90af9db93d2b 6007:ee54e02d3ea0
145 move:[s4] Added e and f 145 move:[s4] Added e and f
146 $ hg up s4 146 $ hg up s4
147 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 147 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
148 $ hg id -r . 148 $ hg id -r .
149 ec94a1ed1330 tip 149 ec94a1ed1330 tip
150 $ hg up --hidden 'min(predecessors(.))' 150 $ hg up --hidden 'min(precursors(.))'
151 updating to a hidden changeset f1d3649d6a8b
152 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330)
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 updated to hidden changeset f1d3649d6a8b
153 (hidden revision 'f1d3649d6a8b' was rewritten as: ec94a1ed1330)
154 working directory parent is obsolete! (f1d3649d6a8b) 154 working directory parent is obsolete! (f1d3649d6a8b)
155 (use 'hg evolve' to update to its successor: ec94a1ed1330) 155 (use 'hg evolve' to update to its successor: ec94a1ed1330)
156 $ hg amend -d '0 1' 156 $ hg amend -d '0 1'
157 1 new orphan changesets 157 1 new orphan changesets
158 2 new content-divergent changesets 158 2 new content-divergent changesets