Mercurial > evolve

comparison tests/test-evolve-obshistory-amend-then-fold.t @ 3923:257481642686 mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:57:13 +0200
parents f7afd3a158e3
children f3713d41b85b 1752a2e7a226
comparison
equal deleted inserted replaced
3922:9839463088ac 3923:257481642686
229 $ hg update 471f378eab4c 229 $ hg update 471f378eab4c
230 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 230 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
231 (use --hidden to access hidden revisions) 231 (use --hidden to access hidden revisions)
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)
234 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 236 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
235 updated to hidden changeset 471f378eab4c
236 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
237 working directory parent is obsolete! (471f378eab4c) 237 working directory parent is obsolete! (471f378eab4c)
238 (use 'hg evolve' to update to its successor: eb5a0daa2192) 238 (use 'hg evolve' to update to its successor: eb5a0daa2192)
239 $ hg update --hidden 0dec01379d3b 239 $ hg update --hidden 0dec01379d3b
240 updating to a hidden changeset 0dec01379d3b
241 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
241 updated to hidden changeset 0dec01379d3b
242 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
243 working directory parent is obsolete! (0dec01379d3b) 243 working directory parent is obsolete! (0dec01379d3b)
244 (use 'hg evolve' to update to its successor: eb5a0daa2192) 244 (use 'hg evolve' to update to its successor: eb5a0daa2192)
245 $ hg update 0dec01379d3b 245 $ hg update 0dec01379d3b
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
247 $ hg update --hidden 'desc(B0)' 247 $ hg update --hidden 'desc(B0)'