equal
deleted
inserted
replaced
279 Start rebase from a commit that is obsolete but not hidden only because it's |
279 Start rebase from a commit that is obsolete but not hidden only because it's |
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 updated to hidden changeset 42ccdea3bb16 |
285 (hidden revision '42ccdea3bb16' is pruned) |
285 (hidden revision '42ccdea3bb16' is pruned) |
286 $ hg rebase --rev 13 --dest 15 |
286 $ hg rebase --rev 13 --dest 15 |
287 rebasing 13:98f6af4ee953 "C" |
287 rebasing 13:98f6af4ee953 "C" |
288 $ hg log -G |
288 $ hg log -G |
289 o 16:294a2b93eb4d C |
289 o 16:294a2b93eb4d C |
640 |
640 |
641 |
641 |
642 Test hidden changesets in the rebase set (issue4504) |
642 Test hidden changesets in the rebase set (issue4504) |
643 |
643 |
644 $ hg up --hidden 9 |
644 $ hg up --hidden 9 |
645 updating to a hidden changeset 4bde274eefcf |
645 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
646 updated to hidden changeset 4bde274eefcf |
646 (hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39) |
647 (hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39) |
647 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
648 $ echo J > J |
648 $ echo J > J |
649 $ hg add J |
649 $ hg add J |
650 $ hg commit -m J |
650 $ hg commit -m J |
651 1 new orphan changesets |
651 1 new orphan changesets |
652 $ hg debugobsolete `hg log --rev . -T '{node}'` |
652 $ hg debugobsolete `hg log --rev . -T '{node}'` |
762 $ hg add B |
762 $ hg add B |
763 $ hg commit -m B0 |
763 $ hg commit -m B0 |
764 $ hg commit --amend -m B1 |
764 $ hg commit --amend -m B1 |
765 $ hg commit --amend -m B2 |
765 $ hg commit --amend -m B2 |
766 $ hg up --hidden 'desc(B0)' |
766 $ hg up --hidden 'desc(B0)' |
767 updating to a hidden changeset a8b11f55fb19 |
767 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
768 updated to hidden changeset a8b11f55fb19 |
768 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) |
769 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) |
769 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
770 $ echo C > C |
770 $ echo C > C |
771 $ hg add C |
771 $ hg add C |
772 $ hg commit -m C |
772 $ hg commit -m C |
773 1 new orphan changesets |
773 1 new orphan changesets |
774 $ hg log -G |
774 $ hg log -G |
788 rebasing 4:212cb178bcbb "C" (tip) |
788 rebasing 4:212cb178bcbb "C" (tip) |
789 |
789 |
790 Even when the chain include missing node |
790 Even when the chain include missing node |
791 |
791 |
792 $ hg up --hidden 'desc(B0)' |
792 $ hg up --hidden 'desc(B0)' |
793 updating to a hidden changeset a8b11f55fb19 |
793 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
794 updated to hidden changeset a8b11f55fb19 |
794 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) |
795 (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) |
795 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
796 $ echo D > D |
796 $ echo D > D |
797 $ hg add D |
797 $ hg add D |
798 $ hg commit -m D |
798 $ hg commit -m D |
799 1 new orphan changesets |
799 1 new orphan changesets |
800 $ hg --hidden strip -r 'desc(B1)' |
800 $ hg --hidden strip -r 'desc(B1)' |
907 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
907 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
908 $ echo "foo" > bar |
908 $ echo "foo" > bar |
909 $ hg add bar |
909 $ hg add bar |
910 $ hg commit --amend -m "10'" |
910 $ hg commit --amend -m "10'" |
911 $ hg up 10 --hidden |
911 $ hg up 10 --hidden |
912 updating to a hidden changeset 121d9e3bc4c6 |
912 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
913 updated to hidden changeset 121d9e3bc4c6 |
913 (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2) |
914 (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2) |
914 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
915 $ echo "bar" > foo |
915 $ echo "bar" > foo |
916 $ hg add foo |
916 $ hg add foo |
917 $ hg commit -m "bar foo" |
917 $ hg commit -m "bar foo" |
918 1 new orphan changesets |
918 1 new orphan changesets |
919 $ hg log -G |
919 $ hg log -G |
1704 |
1704 |
1705 $ eval `hg tags -T '{tag}={node}\n'` |
1705 $ eval `hg tags -T '{tag}={node}\n'` |
1706 $ rm .hg/localtags |
1706 $ rm .hg/localtags |
1707 |
1707 |
1708 $ hg update -q $C --hidden |
1708 $ hg update -q $C --hidden |
1709 updating to a hidden changeset 7829726be4dc |
1709 updated to hidden changeset 7829726be4dc |
1710 (hidden revision '7829726be4dc' is pruned) |
1710 (hidden revision '7829726be4dc' is pruned) |
1711 $ hg rebase -s $B -d $D |
1711 $ hg rebase -s $B -d $D |
1712 rebasing 1:2ec65233581b "B" |
1712 rebasing 1:2ec65233581b "B" |
1713 merging D |
1713 merging D |
1714 warning: conflicts while merging D! (edit, then use 'hg resolve --mark') |
1714 warning: conflicts while merging D! (edit, then use 'hg resolve --mark') |