Mercurial > evolve
comparison tests/test-evolve.t @ 1194:aa7cdd9d7310 stable
evolve: explicitly disable bookmark on evolve (issue4432)
We no longer leave the current bookmark active after an evolve, since it
is no longer pointing to the working directory.
| author | Tyrone Nicholas <tnicholas@fb.com> |
|---|---|
| date | Tue, 27 Jan 2015 16:07:57 +0000 |
| parents | cc3e68120185 |
| children | 0d15d461a316 |
comparison
equal
deleted
inserted
replaced
| 1191:583f7f03434b | 1194:aa7cdd9d7310 |
|---|---|
| 857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 857 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 858 $ hg evolve | 858 $ hg evolve |
| 859 nothing to evolve here | 859 nothing to evolve here |
| 860 (2 troubled changesets, do you want --any ?) | 860 (2 troubled changesets, do you want --any ?) |
| 861 [2] | 861 [2] |
| 862 | |
| 863 | |
| 864 Evolve disables active bookmarks. | |
| 865 | |
| 866 $ hg up 10 | |
| 867 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 868 $ hg bookmark testbookmark | |
| 869 $ ls .hg/bookmarks* | |
| 870 .hg/bookmarks | |
| 871 .hg/bookmarks.current | |
| 872 $ hg evolve | |
| 873 move:[8] a2 | |
| 874 atop:[10] a1__ | |
| 875 (leaving bookmark testbookmark) | |
| 876 working directory is now at f37ed7a60f43 | |
| 877 $ ls .hg/bookmarks* | |
| 878 .hg/bookmarks |