Mercurial > evolve
comparison tests/test-evolve-obshistory-fold.t @ 4227:4684e6db4480 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 09 Nov 2018 20:18:59 +0100 |
parents | d00f0c369bc7 |
children | 537fd9a86c06 |
comparison
equal
deleted
inserted
replaced
4226:94214f8291eb | 4227:4684e6db4480 |
---|---|
227 $ hg update 471f378eab4c | 227 $ hg update 471f378eab4c |
228 abort: hidden revision '471f378eab4c'! | 228 abort: hidden revision '471f378eab4c'! |
229 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 229 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
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) | |
234 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 232 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
235 working directory parent is obsolete! (471f378eab4c) | 233 working directory parent is obsolete! (471f378eab4c) |
236 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 234 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
237 $ hg update 0dec01379d3b | 235 $ hg update 0dec01379d3b |
238 abort: hidden revision '0dec01379d3b'! | 236 abort: hidden revision '0dec01379d3b'! |
239 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 237 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
240 [255] | 238 [255] |
241 $ hg update --hidden 'desc(B0)' | 239 $ hg update --hidden 'desc(B0)' |
242 updating to a hidden changeset 0dec01379d3b | |
243 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
244 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
245 working directory parent is obsolete! (0dec01379d3b) | 241 working directory parent is obsolete! (0dec01379d3b) |
246 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 242 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
247 | 243 |
248 Check output of the server | 244 Check output of the server |