Mercurial > evolve
comparison tests/test-evolve-obshistory-fold.t @ 5239:0471b9ddd0b2 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 08 Apr 2020 01:17:01 +0800 |
| parents | 1752a2e7a226 |
| children | 88f9bbba392d |
comparison
equal
deleted
inserted
replaced
| 5238:02cc51ca6795 | 5239:0471b9ddd0b2 |
|---|---|
| 224 $ hg update 471f378eab4c | 224 $ hg update 471f378eab4c |
| 225 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! | 225 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! |
| 226 (use --hidden to access hidden revisions) | 226 (use --hidden to access hidden revisions) |
| 227 [255] | 227 [255] |
| 228 $ hg update --hidden 'desc(A0)' | 228 $ hg update --hidden 'desc(A0)' |
| 229 updating to a hidden changeset 471f378eab4c | |
| 230 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | |
| 229 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 231 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 230 updated to hidden changeset 471f378eab4c | |
| 231 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) | |
| 232 working directory parent is obsolete! (471f378eab4c) | 232 working directory parent is obsolete! (471f378eab4c) |
| 233 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 233 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 234 $ hg update 0dec01379d3b | 234 $ hg update 0dec01379d3b |
| 235 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! | 235 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! |
| 236 (use --hidden to access hidden revisions) | 236 (use --hidden to access hidden revisions) |
| 237 [255] | 237 [255] |
| 238 $ hg update --hidden 'desc(B0)' | 238 $ hg update --hidden 'desc(B0)' |
| 239 updating to a hidden changeset 0dec01379d3b | |
| 240 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
| 239 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 241 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 240 updated to hidden changeset 0dec01379d3b | |
| 241 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) | |
| 242 working directory parent is obsolete! (0dec01379d3b) | 242 working directory parent is obsolete! (0dec01379d3b) |
| 243 (use 'hg evolve' to update to its successor: eb5a0daa2192) | 243 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
| 244 | 244 |
| 245 Check output of the server | 245 Check output of the server |
| 246 -------------------------- | 246 -------------------------- |