Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3712:fbcf9e92097e mercurial-4.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testcompat: revert output change from 54a469cd5b26 These are 4.6 only changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Apr 2018 08:42:47 +0100
parents 54a469cd5b26
children 19ec729f3ca2 4c68dd62943c
comparison
equal deleted inserted replaced
3711:d822fcc5d901 3712:fbcf9e92097e
199 "rev": 1, 199 "rev": 1,
200 "shortdescription": "A0" 200 "shortdescription": "A0"
201 } 201 }
202 ] 202 ]
203 $ hg update 471f378eab4c 203 $ hg update 471f378eab4c
204 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! 204 abort: hidden revision '471f378eab4c'!
205 (use --hidden to access hidden revisions) 205 (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
206 [255] 206 [255]
207 $ hg update --hidden "desc(A0)" 207 $ hg update --hidden "desc(A0)"
208 updating to a hidden changeset 471f378eab4c 208 updating to a hidden changeset 471f378eab4c
209 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) 209 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
210 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 210 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
302 } 302 }
303 ] 303 ]
304 $ hg up 1 304 $ hg up 1
305 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 305 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
306 $ hg up 0dec01379d3b 306 $ hg up 0dec01379d3b
307 abort: hidden revision '0dec01379d3b' is pruned! 307 abort: hidden revision '0dec01379d3b'!
308 (use --hidden to access hidden revisions) 308 (use --hidden to access hidden revisions; pruned)
309 [255] 309 [255]
310 $ hg up --hidden -r 'desc(B0)' 310 $ hg up --hidden -r 'desc(B0)'
311 updating to a hidden changeset 0dec01379d3b 311 updating to a hidden changeset 0dec01379d3b
312 (hidden revision '0dec01379d3b' is pruned) 312 (hidden revision '0dec01379d3b' is pruned)
313 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 313 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
501 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 501 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
502 note: testing split 502 note: testing split
503 (No patch available, too many successors (2)) 503 (No patch available, too many successors (2))
504 504
505 $ hg update 471597cad322 505 $ hg update 471597cad322
506 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! 506 abort: hidden revision '471597cad322'!
507 (use --hidden to access hidden revisions) 507 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
508 [255] 508 [255]
509 $ hg update --hidden 'min(desc(A0))' 509 $ hg update --hidden 'min(desc(A0))'
510 updating to a hidden changeset 471597cad322 510 updating to a hidden changeset 471597cad322
511 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 511 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
512 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 512 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
782 x de7290d8b885 (1) A0 782 x de7290d8b885 (1) A0
783 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 783 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
784 (No patch available, too many successors (4)) 784 (No patch available, too many successors (4))
785 785
786 $ hg update de7290d8b885 786 $ hg update de7290d8b885
787 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! 787 abort: hidden revision 'de7290d8b885'!
788 (use --hidden to access hidden revisions) 788 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
789 [255] 789 [255]
790 $ hg update --hidden 'min(desc(A0))' 790 $ hg update --hidden 'min(desc(A0))'
791 updating to a hidden changeset de7290d8b885 791 updating to a hidden changeset de7290d8b885
792 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) 792 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
793 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 793 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1007 "rev": 2, 1007 "rev": 2,
1008 "shortdescription": "B0" 1008 "shortdescription": "B0"
1009 } 1009 }
1010 ] 1010 ]
1011 $ hg update 471f378eab4c 1011 $ hg update 471f378eab4c
1012 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 1012 abort: hidden revision '471f378eab4c'!
1013 (use --hidden to access hidden revisions) 1013 (use --hidden to access hidden revisions; successor: eb5a0daa2192)
1014 [255] 1014 [255]
1015 $ hg update --hidden 'desc(A0)' 1015 $ hg update --hidden 'desc(A0)'
1016 updating to a hidden changeset 471f378eab4c 1016 updating to a hidden changeset 471f378eab4c
1017 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 1017 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
1018 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1018 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1019 working directory parent is obsolete! (471f378eab4c) 1019 working directory parent is obsolete! (471f378eab4c)
1020 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1020 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1021 $ hg update 0dec01379d3b 1021 $ hg update 0dec01379d3b
1022 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! 1022 abort: hidden revision '0dec01379d3b'!
1023 (use --hidden to access hidden revisions) 1023 (use --hidden to access hidden revisions; successor: eb5a0daa2192)
1024 [255] 1024 [255]
1025 $ hg update --hidden 'desc(B0)' 1025 $ hg update --hidden 'desc(B0)'
1026 updating to a hidden changeset 0dec01379d3b 1026 updating to a hidden changeset 0dec01379d3b
1027 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1027 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1028 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1028 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1354 "rev": 2, 1354 "rev": 2,
1355 "shortdescription": "A1" 1355 "shortdescription": "A1"
1356 } 1356 }
1357 ] 1357 ]
1358 $ hg update 471f378eab4c 1358 $ hg update 471f378eab4c
1359 abort: hidden revision '471f378eab4c' has diverged! 1359 abort: hidden revision '471f378eab4c'!
1360 (use --hidden to access hidden revisions) 1360 (use --hidden to access hidden revisions; diverged)
1361 [255] 1361 [255]
1362 $ hg update --hidden 'desc(A0)' 1362 $ hg update --hidden 'desc(A0)'
1363 updating to a hidden changeset 471f378eab4c 1363 updating to a hidden changeset 471f378eab4c
1364 (hidden revision '471f378eab4c' has diverged) 1364 (hidden revision '471f378eab4c' has diverged)
1365 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1365 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1585 "rev": 1, 1585 "rev": 1,
1586 "shortdescription": "A0" 1586 "shortdescription": "A0"
1587 } 1587 }
1588 ] 1588 ]
1589 $ hg update 471f378eab4c 1589 $ hg update 471f378eab4c
1590 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 1590 abort: hidden revision '471f378eab4c'!
1591 (use --hidden to access hidden revisions) 1591 (use --hidden to access hidden revisions; successor: eb5a0daa2192)
1592 [255] 1592 [255]
1593 $ hg update --hidden 'desc(A0)' 1593 $ hg update --hidden 'desc(A0)'
1594 updating to a hidden changeset 471f378eab4c 1594 updating to a hidden changeset 471f378eab4c
1595 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 1595 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
1596 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1596 0 files updated, 0 files merged, 1 files removed, 0 files unresolved