Mercurial > evolve
comparison tests/test-evolve-obshistory-fold.t @ 4868:f76141f3ce80 mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 27 Sep 2019 13:03:22 +0200 |
parents | f3713d41b85b |
children | d00f0c369bc7 |
comparison
equal
deleted
inserted
replaced
4867:769b907e644e | 4868:f76141f3ce80 |
---|---|
223 "rev": 2, | 223 "rev": 2, |
224 "shortdescription": "B0" | 224 "shortdescription": "B0" |
225 } | 225 } |
226 ] | 226 ] |
227 $ hg update 471f378eab4c | 227 $ hg update 471f378eab4c |
228 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! | 228 abort: hidden revision '471f378eab4c'! |
229 (use --hidden to access hidden revisions) | 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 | 232 updating to a hidden changeset 471f378eab4c |
233 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | 233 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) |
234 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 |
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'! |
239 (use --hidden to access hidden revisions) | 239 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
240 [255] | 240 [255] |
241 $ hg update --hidden 'desc(B0)' | 241 $ hg update --hidden 'desc(B0)' |
242 updating to a hidden changeset 0dec01379d3b | 242 updating to a hidden changeset 0dec01379d3b |
243 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | 243 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) |
244 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 |