Mercurial > hg
comparison tests/test-bookmarks.t @ 28065:6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Bare 'hg update' now brings you to the tipmost descendant (on the same branch).
Leaving the user on the same topological branch. The previous behavior, updating
to the tipmost changeset on the same branch could lead to jump from a
topological branch to another. This was confusing and impractical. As the only
conceivable reason for the old behavior have been address by the recently
introduce message about other heads, we can "safely" change this behavior
All test changes have been reviewed and seen a valid consequences.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 02 Feb 2016 15:24:11 +0000 |
| parents | 72072cfc7e91 |
| children | 2e1bceeea520 |
comparison
equal
deleted
inserted
replaced
| 28064:9e0535da20a5 | 28065:6b1fc09c699a |
|---|---|
| 733 o changeset: 0:f7b1eb17ad24 | 733 o changeset: 0:f7b1eb17ad24 |
| 734 user: test | 734 user: test |
| 735 date: Thu Jan 01 00:00:00 1970 +0000 | 735 date: Thu Jan 01 00:00:00 1970 +0000 |
| 736 summary: 0 | 736 summary: 0 |
| 737 | 737 |
| 738 test non-linear update not clearing active bookmark | 738 |
| 739 | 739 no-op update doesn't deactive bookmarks |
| 740 $ hg up 1 | 740 |
| 741 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 742 (leaving bookmark four) | |
| 743 $ hg book drop | |
| 744 $ hg up -C | |
| 745 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 746 (leaving bookmark drop) | |
| 747 1 other heads for branch "default" | |
| 748 $ hg sum | |
| 749 parent: 2:db815d6d32e6 | |
| 750 2 | |
| 751 branch: default | |
| 752 bookmarks: should-end-on-two | |
| 753 commit: 2 unknown (clean) | |
| 754 update: 1 new changesets, 2 branch heads (merge) | |
| 755 phases: 4 draft | |
| 756 $ hg book | |
| 757 drop 1:925d80f479bb | |
| 758 four 3:9ba5f110a0b3 | |
| 759 should-end-on-two 2:db815d6d32e6 | |
| 760 $ hg book -d drop | |
| 761 $ hg up four | 741 $ hg up four |
| 762 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 742 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 763 (activating bookmark four) | 743 (activating bookmark four) |
| 764 | |
| 765 no-op update doesn't deactive bookmarks | |
| 766 | |
| 767 $ hg up | 744 $ hg up |
| 768 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 745 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 769 $ hg sum | 746 $ hg sum |
| 770 parent: 3:9ba5f110a0b3 tip | 747 parent: 3:9ba5f110a0b3 tip |
| 771 y | 748 y |