Mercurial > evolve
comparison tests/test-prev-next.t @ 1427:fcc467ca740e
next/prev: require --merge to move with uncommitted changes
This should previous common mistake.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 23 Jun 2015 15:26:51 -0700 |
| parents | cc3e68120185 |
| children | 6fd6c98f9f70 |
comparison
equal
deleted
inserted
replaced
| 1426:6db55f28c965 | 1427:fcc467ca740e |
|---|---|
| 80 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 80 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 81 [1] added b | 81 [1] added b |
| 82 $ hg bookmarks | 82 $ hg bookmarks |
| 83 mark 2:4e26ef31f919 | 83 mark 2:4e26ef31f919 |
| 84 no-move 2:4e26ef31f919 | 84 no-move 2:4e26ef31f919 |
| 85 | |
| 86 | |
| 87 Behavior with local modification | |
| 88 -------------------------------- | |
| 89 | |
| 90 $ echo foo > modified-bar | |
| 91 $ hg add modified-bar | |
| 92 $ hg prev | |
| 93 abort: uncommitted changes | |
| 94 (do you want --merge?) | |
| 95 [255] | |
| 96 $ hg prev --merge | |
| 97 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 98 [0] added a | |
| 99 $ hg next | |
| 100 abort: uncommitted changes | |
| 101 (do you want --merge?) | |
| 102 [255] | |
| 103 $ hg next --merge | |
| 104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 105 [1] added b | |
| 106 |