Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3747:1e103c7f7663

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update to new outputs Mercurial core ea63a2004d09 update the hidden changeset warning during update after the effective update. CORE-TEST-OUTPUT-UPDATE: ea63a2004d09
author Boris Feld <boris.feld@octobus.net>
date Mon, 21 May 2018 14:56:51 +0200
parents f5b9030e18e9
children 16bec7609a08
comparison
equal deleted inserted replaced
3746:4dcf87849f9d 3747:1e103c7f7663
220 $ hg update 471f378eab4c 220 $ hg update 471f378eab4c
221 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! 221 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
222 (use --hidden to access hidden revisions) 222 (use --hidden to access hidden revisions)
223 [255] 223 [255]
224 $ hg update --hidden "desc(A0)" 224 $ hg update --hidden "desc(A0)"
225 updating to a hidden changeset 471f378eab4c 225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
226 updated to hidden changeset 471f378eab4c
226 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) 227 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
227 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
228 working directory parent is obsolete! (471f378eab4c) 228 working directory parent is obsolete! (471f378eab4c)
229 (use 'hg evolve' to update to its successor: 4ae3a4151de9) 229 (use 'hg evolve' to update to its successor: 4ae3a4151de9)
230 230
231 Test output with pruned commit 231 Test output with pruned commit
232 ============================== 232 ==============================
323 $ hg up 0dec01379d3b 323 $ hg up 0dec01379d3b
324 abort: hidden revision '0dec01379d3b' is pruned! 324 abort: hidden revision '0dec01379d3b' is pruned!
325 (use --hidden to access hidden revisions) 325 (use --hidden to access hidden revisions)
326 [255] 326 [255]
327 $ hg up --hidden -r 'desc(B0)' 327 $ hg up --hidden -r 'desc(B0)'
328 updating to a hidden changeset 0dec01379d3b 328 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
329 updated to hidden changeset 0dec01379d3b
329 (hidden revision '0dec01379d3b' is pruned) 330 (hidden revision '0dec01379d3b' is pruned)
330 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
331 working directory parent is obsolete! (0dec01379d3b) 331 working directory parent is obsolete! (0dec01379d3b)
332 (use 'hg evolve' to update to its parent successor) 332 (use 'hg evolve' to update to its parent successor)
333 333
334 Test output with splitted commit 334 Test output with splitted commit
335 ================================ 335 ================================
522 $ hg update 471597cad322 522 $ hg update 471597cad322
523 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! 523 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
524 (use --hidden to access hidden revisions) 524 (use --hidden to access hidden revisions)
525 [255] 525 [255]
526 $ hg update --hidden 'min(desc(A0))' 526 $ hg update --hidden 'min(desc(A0))'
527 updating to a hidden changeset 471597cad322 527 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
528 updated to hidden changeset 471597cad322
528 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 529 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
529 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 working directory parent is obsolete! (471597cad322) 530 working directory parent is obsolete! (471597cad322)
531 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 531 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
532 532
533 Test output with lots of splitted commit 533 Test output with lots of splitted commit
534 ======================================== 534 ========================================
803 $ hg update de7290d8b885 803 $ hg update de7290d8b885
804 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more! 804 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
805 (use --hidden to access hidden revisions) 805 (use --hidden to access hidden revisions)
806 [255] 806 [255]
807 $ hg update --hidden 'min(desc(A0))' 807 $ hg update --hidden 'min(desc(A0))'
808 updating to a hidden changeset de7290d8b885 808 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
809 updated to hidden changeset de7290d8b885
809 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) 810 (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more)
810 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
811 working directory parent is obsolete! (de7290d8b885) 811 working directory parent is obsolete! (de7290d8b885)
812 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) 812 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
813 813
814 Test output with folded commit 814 Test output with folded commit
815 ============================== 815 ==============================
1028 $ hg update 471f378eab4c 1028 $ hg update 471f378eab4c
1029 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 1029 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
1030 (use --hidden to access hidden revisions) 1030 (use --hidden to access hidden revisions)
1031 [255] 1031 [255]
1032 $ hg update --hidden 'desc(A0)' 1032 $ hg update --hidden 'desc(A0)'
1033 updating to a hidden changeset 471f378eab4c 1033 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1034 updated to hidden changeset 471f378eab4c
1034 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 1035 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
1035 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1036 working directory parent is obsolete! (471f378eab4c) 1036 working directory parent is obsolete! (471f378eab4c)
1037 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1037 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1038 $ hg update 0dec01379d3b 1038 $ hg update 0dec01379d3b
1039 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192! 1039 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
1040 (use --hidden to access hidden revisions) 1040 (use --hidden to access hidden revisions)
1041 [255] 1041 [255]
1042 $ hg update --hidden 'desc(B0)' 1042 $ hg update --hidden 'desc(B0)'
1043 updating to a hidden changeset 0dec01379d3b 1043 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1044 updated to hidden changeset 0dec01379d3b
1044 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1045 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1045 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1046 working directory parent is obsolete! (0dec01379d3b) 1046 working directory parent is obsolete! (0dec01379d3b)
1047 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1047 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1048 1048
1049 Test output with divergence 1049 Test output with divergence
1050 =========================== 1050 ===========================
1075 user: test 1075 user: test
1076 date: Thu Jan 01 00:00:00 1970 +0000 1076 date: Thu Jan 01 00:00:00 1970 +0000
1077 summary: ROOT 1077 summary: ROOT
1078 1078
1079 $ hg update --hidden 'desc(A0)' 1079 $ hg update --hidden 'desc(A0)'
1080 updating to a hidden changeset 471f378eab4c 1080 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1081 updated to hidden changeset 471f378eab4c
1081 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 1082 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
1082 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1083 working directory parent is obsolete! (471f378eab4c) 1083 working directory parent is obsolete! (471f378eab4c)
1084 (use 'hg evolve' to update to its successor: fdf9bde5129a) 1084 (use 'hg evolve' to update to its successor: fdf9bde5129a)
1085 $ hg amend -m "A2" 1085 $ hg amend -m "A2"
1086 2 new content-divergent changesets 1086 2 new content-divergent changesets
1087 $ hg log --hidden -G 1087 $ hg log --hidden -G
1375 $ hg update 471f378eab4c 1375 $ hg update 471f378eab4c
1376 abort: hidden revision '471f378eab4c' has diverged! 1376 abort: hidden revision '471f378eab4c' has diverged!
1377 (use --hidden to access hidden revisions) 1377 (use --hidden to access hidden revisions)
1378 [255] 1378 [255]
1379 $ hg update --hidden 'desc(A0)' 1379 $ hg update --hidden 'desc(A0)'
1380 updating to a hidden changeset 471f378eab4c 1380 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1381 updated to hidden changeset 471f378eab4c
1381 (hidden revision '471f378eab4c' has diverged) 1382 (hidden revision '471f378eab4c' has diverged)
1382 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1383 working directory parent is obsolete! (471f378eab4c) 1383 working directory parent is obsolete! (471f378eab4c)
1384 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 1384 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
1385 1385
1386 Test output with amended + folded commit 1386 Test output with amended + folded commit
1387 ======================================== 1387 ========================================
1606 $ hg update 471f378eab4c 1606 $ hg update 471f378eab4c
1607 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 1607 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
1608 (use --hidden to access hidden revisions) 1608 (use --hidden to access hidden revisions)
1609 [255] 1609 [255]
1610 $ hg update --hidden 'desc(A0)' 1610 $ hg update --hidden 'desc(A0)'
1611 updating to a hidden changeset 471f378eab4c 1611 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1612 updated to hidden changeset 471f378eab4c
1612 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 1613 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
1613 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1614 working directory parent is obsolete! (471f378eab4c) 1614 working directory parent is obsolete! (471f378eab4c)
1615 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1615 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1616 $ hg update --hidden 0dec01379d3b 1616 $ hg update --hidden 0dec01379d3b
1617 updating to a hidden changeset 0dec01379d3b 1617 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1618 updated to hidden changeset 0dec01379d3b
1618 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1619 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
1619 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1620 working directory parent is obsolete! (0dec01379d3b) 1620 working directory parent is obsolete! (0dec01379d3b)
1621 (use 'hg evolve' to update to its successor: eb5a0daa2192) 1621 (use 'hg evolve' to update to its successor: eb5a0daa2192)
1622 $ hg update 0dec01379d3b 1622 $ hg update 0dec01379d3b
1623 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1623 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1624 $ hg update --hidden 'desc(B0)' 1624 $ hg update --hidden 'desc(B0)'