Mercurial > evolve

comparison tests/test-evolve-obshistory-amend-then-fold.t @ 4363:a2fdbece7ce1 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents d00f0c369bc7
children 537fd9a86c06
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
229 $ hg update 471f378eab4c 229 $ hg update 471f378eab4c
230 abort: hidden revision '471f378eab4c'! 230 abort: hidden revision '471f378eab4c'!
231 (use --hidden to access hidden revisions; successor: eb5a0daa2192) 231 (use --hidden to access hidden revisions; successor: eb5a0daa2192)
232 [255] 232 [255]
233 $ hg update --hidden 'desc(A0)' 233 $ hg update --hidden 'desc(A0)'
234 updating to a hidden changeset 471f378eab4c
235 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
236 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 234 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
237 working directory parent is obsolete! (471f378eab4c) 235 working directory parent is obsolete! (471f378eab4c)
238 (use 'hg evolve' to update to its successor: eb5a0daa2192) 236 (use 'hg evolve' to update to its successor: eb5a0daa2192)
239 $ hg update --hidden 0dec01379d3b 237 $ hg update --hidden 0dec01379d3b
240 updating to a hidden changeset 0dec01379d3b
241 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 238 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
243 working directory parent is obsolete! (0dec01379d3b) 239 working directory parent is obsolete! (0dec01379d3b)
244 (use 'hg evolve' to update to its successor: eb5a0daa2192) 240 (use 'hg evolve' to update to its successor: eb5a0daa2192)
245 $ hg update 0dec01379d3b 241 $ hg update 0dec01379d3b
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 242 0 files updated, 0 files merged, 0 files removed, 0 files unresolved