Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 35711:35a0f6f31eef
update: display the obsfate of hidden revision we update to
Display the same message we added recently to the filtered error message when
updating to a hidden obsolete changeset.
Differential Revision: https://phab.mercurial-scm.org/D1869
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 16 Jan 2018 14:08:54 +0100 |
parents | 1a09dad8b85a |
children | a1a5c3842b6f |
comparison
equal
deleted
inserted
replaced
35710:5cd60b0587a8 | 35711:35a0f6f31eef |
---|---|
280 a working copy parent. We should be moved back to the starting commit as usual | 280 a working copy parent. We should be moved back to the starting commit as usual |
281 even though it is hidden (until we're moved there). | 281 even though it is hidden (until we're moved there). |
282 | 282 |
283 $ hg --hidden up -qr 'first(hidden())' | 283 $ hg --hidden up -qr 'first(hidden())' |
284 updating to a hidden changeset 42ccdea3bb16 | 284 updating to a hidden changeset 42ccdea3bb16 |
285 (hidden revision '42ccdea3bb16' is pruned) | |
285 $ hg rebase --rev 13 --dest 15 | 286 $ hg rebase --rev 13 --dest 15 |
286 rebasing 13:98f6af4ee953 "C" | 287 rebasing 13:98f6af4ee953 "C" |
287 $ hg log -G | 288 $ hg log -G |
288 o 16:294a2b93eb4d C | 289 o 16:294a2b93eb4d C |
289 | | 290 | |
613 | 614 |
614 Test hidden changesets in the rebase set (issue4504) | 615 Test hidden changesets in the rebase set (issue4504) |
615 | 616 |
616 $ hg up --hidden 9 | 617 $ hg up --hidden 9 |
617 updating to a hidden changeset 4bde274eefcf | 618 updating to a hidden changeset 4bde274eefcf |
619 (hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39) | |
618 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | 620 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
619 $ echo J > J | 621 $ echo J > J |
620 $ hg add J | 622 $ hg add J |
621 $ hg commit -m J | 623 $ hg commit -m J |
622 1 new orphan changesets | 624 1 new orphan changesets |
734 $ hg commit -m B0 | 736 $ hg commit -m B0 |
735 $ hg commit --amend -m B1 | 737 $ hg commit --amend -m B1 |
736 $ hg commit --amend -m B2 | 738 $ hg commit --amend -m B2 |
737 $ hg up --hidden 'desc(B0)' | 739 $ hg up --hidden 'desc(B0)' |
738 updating to a hidden changeset a8b11f55fb19 | 740 updating to a hidden changeset a8b11f55fb19 |
741 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) | |
739 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 742 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
740 $ echo C > C | 743 $ echo C > C |
741 $ hg add C | 744 $ hg add C |
742 $ hg commit -m C | 745 $ hg commit -m C |
743 1 new orphan changesets | 746 1 new orphan changesets |
759 | 762 |
760 Even when the chain include missing node | 763 Even when the chain include missing node |
761 | 764 |
762 $ hg up --hidden 'desc(B0)' | 765 $ hg up --hidden 'desc(B0)' |
763 updating to a hidden changeset a8b11f55fb19 | 766 updating to a hidden changeset a8b11f55fb19 |
767 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) | |
764 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 768 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
765 $ echo D > D | 769 $ echo D > D |
766 $ hg add D | 770 $ hg add D |
767 $ hg commit -m D | 771 $ hg commit -m D |
768 1 new orphan changesets | 772 1 new orphan changesets |
876 $ echo "foo" > bar | 880 $ echo "foo" > bar |
877 $ hg add bar | 881 $ hg add bar |
878 $ hg commit --amend -m "10'" | 882 $ hg commit --amend -m "10'" |
879 $ hg up 10 --hidden | 883 $ hg up 10 --hidden |
880 updating to a hidden changeset 121d9e3bc4c6 | 884 updating to a hidden changeset 121d9e3bc4c6 |
885 (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2) | |
881 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 886 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
882 $ echo "bar" > foo | 887 $ echo "bar" > foo |
883 $ hg add foo | 888 $ hg add foo |
884 $ hg commit -m "bar foo" | 889 $ hg commit -m "bar foo" |
885 1 new orphan changesets | 890 1 new orphan changesets |
1631 $ eval `hg tags -T '{tag}={node}\n'` | 1636 $ eval `hg tags -T '{tag}={node}\n'` |
1632 $ rm .hg/localtags | 1637 $ rm .hg/localtags |
1633 | 1638 |
1634 $ hg update -q $C --hidden | 1639 $ hg update -q $C --hidden |
1635 updating to a hidden changeset 7829726be4dc | 1640 updating to a hidden changeset 7829726be4dc |
1641 (hidden revision '7829726be4dc' is pruned) | |
1636 $ hg rebase -s $B -d $D | 1642 $ hg rebase -s $B -d $D |
1637 rebasing 1:2ec65233581b "B" | 1643 rebasing 1:2ec65233581b "B" |
1638 merging D | 1644 merging D |
1639 warning: conflicts while merging D! (edit, then use 'hg resolve --mark') | 1645 warning: conflicts while merging D! (edit, then use 'hg resolve --mark') |
1640 unresolved conflicts (see hg resolve, then hg rebase --continue) | 1646 unresolved conflicts (see hg resolve, then hg rebase --continue) |