Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 35057:0564e7c7f4cd
tests: add a couple of 'hg log' calls in test-rebase-obsolete.t
It helps understanding tests.
author | Denis Laxalde <denis@laxalde.org> |
---|---|
date | Sat, 11 Nov 2017 19:25:32 +0100 |
parents | 235d58aa723e |
children | a68c3420be41 |
comparison
equal
deleted
inserted
replaced
35056:235d58aa723e | 35057:0564e7c7f4cd |
---|---|
366 | 366 |
367 $ hg clone base hidden | 367 $ hg clone base hidden |
368 updating to branch default | 368 updating to branch default |
369 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 369 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
370 $ cd hidden | 370 $ cd hidden |
371 $ hg log -G | |
372 @ 7:02de42196ebe H | |
373 | | |
374 | o 6:eea13746799a G | |
375 |/| | |
376 o | 5:24b6387c8c8c F | |
377 | | | |
378 | o 4:9520eea781bc E | |
379 |/ | |
380 | o 3:32af7686d403 D | |
381 | | | |
382 | o 2:5fddd98957c8 C | |
383 | | | |
384 | o 1:42ccdea3bb16 B | |
385 |/ | |
386 o 0:cd010b8cd998 A | |
387 | |
371 $ hg rebase -s 5fddd98957c8 -d eea13746799a | 388 $ hg rebase -s 5fddd98957c8 -d eea13746799a |
372 rebasing 2:5fddd98957c8 "C" | 389 rebasing 2:5fddd98957c8 "C" |
373 rebasing 3:32af7686d403 "D" | 390 rebasing 3:32af7686d403 "D" |
391 $ hg log -G | |
392 o 9:cf44d2f5a9f4 D | |
393 | | |
394 o 8:e273c5e7d2d2 C | |
395 | | |
396 | @ 7:02de42196ebe H | |
397 | | | |
398 o | 6:eea13746799a G | |
399 |\| | |
400 | o 5:24b6387c8c8c F | |
401 | | | |
402 o | 4:9520eea781bc E | |
403 |/ | |
404 | o 1:42ccdea3bb16 B | |
405 |/ | |
406 o 0:cd010b8cd998 A | |
407 | |
374 $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe | 408 $ hg rebase -s 42ccdea3bb16 -d 02de42196ebe |
375 rebasing 1:42ccdea3bb16 "B" | 409 rebasing 1:42ccdea3bb16 "B" |
376 $ hg log -G | 410 $ hg log -G |
377 o 10:7c6027df6a99 B | 411 o 10:7c6027df6a99 B |
378 | | 412 | |
693 $ hg up --hidden 'desc(B0)' | 727 $ hg up --hidden 'desc(B0)' |
694 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 728 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
695 $ echo C > C | 729 $ echo C > C |
696 $ hg add C | 730 $ hg add C |
697 $ hg commit -m C | 731 $ hg commit -m C |
732 $ hg log -G | |
733 @ 4:212cb178bcbb C | |
734 | | |
735 | o 3:261e70097290 B2 | |
736 | | | |
737 x | 1:a8b11f55fb19 B0 (rewritten using amend as 3:261e70097290) | |
738 |/ | |
739 o 0:4a2df7238c3b A | |
740 | |
698 | 741 |
699 Rebase finds its way in a chain of marker | 742 Rebase finds its way in a chain of marker |
700 | 743 |
701 $ hg rebase -d 'desc(B2)' | 744 $ hg rebase -d 'desc(B2)' |
702 note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" | 745 note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 3:261e70097290 "B2" |
709 $ echo D > D | 752 $ echo D > D |
710 $ hg add D | 753 $ hg add D |
711 $ hg commit -m D | 754 $ hg commit -m D |
712 $ hg --hidden strip -r 'desc(B1)' | 755 $ hg --hidden strip -r 'desc(B1)' |
713 saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob) | 756 saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg (glob) |
757 $ hg log -G | |
758 @ 5:1a79b7535141 D | |
759 | | |
760 | o 4:ff2c4d47b71d C | |
761 | | | |
762 | o 2:261e70097290 B2 | |
763 | | | |
764 x | 1:a8b11f55fb19 B0 (rewritten using amend as 2:261e70097290) | |
765 |/ | |
766 o 0:4a2df7238c3b A | |
767 | |
714 | 768 |
715 $ hg rebase -d 'desc(B2)' | 769 $ hg rebase -d 'desc(B2)' |
716 note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" | 770 note: not rebasing 1:a8b11f55fb19 "B0", already in destination as 2:261e70097290 "B2" |
717 rebasing 5:1a79b7535141 "D" (tip) | 771 rebasing 5:1a79b7535141 "D" (tip) |
718 $ hg up 4 | 772 $ hg up 4 |
764 $ hg add nonrelevant | 818 $ hg add nonrelevant |
765 $ hg commit -m nonrelevant | 819 $ hg commit -m nonrelevant |
766 created new head | 820 created new head |
767 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true | 821 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true |
768 obsoleted 1 changesets | 822 obsoleted 1 changesets |
823 $ hg log -G | |
824 @ 11:f44da1f4954c nonrelevant (pruned) | |
825 | | |
826 | o 10:121d9e3bc4c6 P | |
827 |/ | |
828 o 9:4be60e099a77 C | |
829 | | |
830 o 6:9c48361117de D | |
831 | | |
832 o 2:261e70097290 B2 | |
833 | | |
834 o 0:4a2df7238c3b A | |
835 | |
769 $ hg rebase -r . -d 10 | 836 $ hg rebase -r . -d 10 |
770 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor | 837 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor |
771 | 838 |
772 If a rebase is going to create divergence, it should abort | 839 If a rebase is going to create divergence, it should abort |
773 | 840 |