Mercurial > hg
comparison tests/test-bookmarks-merge.t @ 21404:ca275f7ec576
update: when deactivating a bookmark, print a message
This helps prevent user confusion when innocent-seeming commands like
'hg update -C .' are run.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 14 May 2014 12:49:55 -0700 |
| parents | 730b769fb634 |
| children | 10f15e34d86c |
comparison
equal
deleted
inserted
replaced
| 21403:3db723e2dc20 | 21404:ca275f7ec576 |
|---|---|
| 30 b 1:d2ae7f538514 | 30 b 1:d2ae7f538514 |
| 31 * c 3:b8f96cf4688b | 31 * c 3:b8f96cf4688b |
| 32 | 32 |
| 33 $ hg up -C 3 | 33 $ hg up -C 3 |
| 34 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 34 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 35 (leaving bookmark c) | |
| 35 $ echo d > d | 36 $ echo d > d |
| 36 $ hg add d | 37 $ hg add d |
| 37 $ hg commit -m'd' | 38 $ hg commit -m'd' |
| 38 | 39 |
| 39 $ hg up -C 3 | 40 $ hg up -C 3 |
| 52 | 53 |
| 53 # the picked side is bookmarked | 54 # the picked side is bookmarked |
| 54 | 55 |
| 55 $ hg up -C 4 | 56 $ hg up -C 4 |
| 56 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 57 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 58 (leaving bookmark e) | |
| 57 $ hg merge | 59 $ hg merge |
| 58 abort: heads are bookmarked - please merge with an explicit rev | 60 abort: heads are bookmarked - please merge with an explicit rev |
| 59 (run 'hg heads' to see all heads) | 61 (run 'hg heads' to see all heads) |
| 60 [255] | 62 [255] |
| 61 | 63 |
| 70 | 72 |
| 71 # merge bookmark heads | 73 # merge bookmark heads |
| 72 | 74 |
| 73 $ hg up -C 4 | 75 $ hg up -C 4 |
| 74 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 76 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 77 (leaving bookmark e) | |
| 75 $ echo f > f | 78 $ echo f > f |
| 76 $ hg commit -Am "f" | 79 $ hg commit -Am "f" |
| 77 adding f | 80 adding f |
| 78 $ hg bookmarks -r 4 "e@diverged" | 81 $ hg bookmarks -r 4 "e@diverged" |
| 79 $ hg up -q -C "e@diverged" | 82 $ hg up -q -C "e@diverged" |
| 112 | 115 |
| 113 # test warning when all heads are inactive bookmarks | 116 # test warning when all heads are inactive bookmarks |
| 114 | 117 |
| 115 $ hg up -C 6 | 118 $ hg up -C 6 |
| 116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 119 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 120 (leaving bookmark e) | |
| 117 $ echo g > g | 121 $ echo g > g |
| 118 $ hg commit -Am 'g' | 122 $ hg commit -Am 'g' |
| 119 adding g | 123 adding g |
| 120 $ hg bookmark -i g | 124 $ hg bookmark -i g |
| 121 $ hg bookmarks | 125 $ hg bookmarks |