comparison tests/test-evolve-obshistory-fold.t @ 3909:f7afd3a158e3 mercurial-4.6

test-compat: backout change to 1e103c7f7663
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 31 Jul 2018 11:45:01 +0200
parents 83e8803e1cf1
children f3713d41b85b 1752a2e7a226
comparison
equal deleted inserted replaced
3908:2af10d0a59e0 3909:f7afd3a158e3
227 $ hg update 471f378eab4c 227 $ hg update 471f378eab4c
228 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 228 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
229 (use --hidden to access hidden revisions) 229 (use --hidden to access hidden revisions)
230 [255] 230 [255]
231 $ hg update --hidden 'desc(A0)' 231 $ hg update --hidden 'desc(A0)'
232 updating to a hidden changeset 471f378eab4c
233 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
232 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
233 updated to hidden changeset 471f378eab4c
234 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
235 working directory parent is obsolete! (471f378eab4c) 235 working directory parent is obsolete! (471f378eab4c)
236 (use 'hg evolve' to update to its successor: eb5a0daa2192) 236 (use 'hg evolve' to update to its successor: eb5a0daa2192)
237 $ hg update 0dec01379d3b 237 $ hg update 0dec01379d3b
238 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! 238 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
239 (use --hidden to access hidden revisions) 239 (use --hidden to access hidden revisions)
240 [255] 240 [255]
241 $ hg update --hidden 'desc(B0)' 241 $ hg update --hidden 'desc(B0)'
242 updating to a hidden changeset 0dec01379d3b
243 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 244 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
243 updated to hidden changeset 0dec01379d3b
244 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
245 working directory parent is obsolete! (0dec01379d3b) 245 working directory parent is obsolete! (0dec01379d3b)
246 (use 'hg evolve' to update to its successor: eb5a0daa2192) 246 (use 'hg evolve' to update to its successor: eb5a0daa2192)
247 247
248 Check output of the server 248 Check output of the server
249 -------------------------- 249 --------------------------