Mercurial > hg
comparison tests/test-bookmarks.t @ 25789:95dc4b009f60
bookmarks: clear active bookmark on non-linear update
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 14 Jul 2015 18:50:20 -0500 |
| parents | e78a80f8f51e |
| children | 04ae6feb04c5 |
comparison
equal
deleted
inserted
replaced
| 25788:a36fd0993522 | 25789:95dc4b009f60 |
|---|---|
| 671 o changeset: 0:f7b1eb17ad24 | 671 o changeset: 0:f7b1eb17ad24 |
| 672 user: test | 672 user: test |
| 673 date: Thu Jan 01 00:00:00 1970 +0000 | 673 date: Thu Jan 01 00:00:00 1970 +0000 |
| 674 summary: 0 | 674 summary: 0 |
| 675 | 675 |
| 676 test non-linear update not clearing active bookmark | |
| 677 | |
| 678 $ hg up 1 | |
| 679 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 680 (leaving bookmark four) | |
| 681 $ hg book drop | |
| 682 $ hg up -C | |
| 683 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 684 (leaving bookmark drop) | |
| 685 $ hg sum | |
| 686 parent: 2:db815d6d32e6 | |
| 687 2 | |
| 688 branch: default | |
| 689 bookmarks: should-end-on-two | |
| 690 commit: 2 unknown (clean) | |
| 691 update: 1 new changesets, 2 branch heads (merge) | |
| 692 phases: 4 draft | |
| 693 $ hg book | |
| 694 drop 1:925d80f479bb | |
| 695 four 3:9ba5f110a0b3 | |
| 696 should-end-on-two 2:db815d6d32e6 | |
| 697 $ hg book -d drop | |
| 698 $ hg up four | |
| 699 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 700 (activating bookmark four) | |
| 676 | 701 |
| 677 test clearing divergent bookmarks of linear ancestors | 702 test clearing divergent bookmarks of linear ancestors |
| 678 | 703 |
| 679 $ hg bookmark Z -r 0 | 704 $ hg bookmark Z -r 0 |
| 680 $ hg bookmark Z@1 -r 1 | 705 $ hg bookmark Z@1 -r 1 |