Mercurial > evolve
comparison tests/test-prev-next.t @ 3273:c0ee9ddfd5ff mercurial-4.3
test-compat: merge stable into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Dec 2017 09:33:04 +0100 |
| parents | a867d59ea97a 8cc8fb94cc00 |
| children | 875de4816c5b 4303a46b4167 |
comparison
equal
deleted
inserted
replaced
| 3187:68aeeb4d4b8f | 3273:c0ee9ddfd5ff |
|---|---|
| 198 created new head | 198 created new head |
| 199 $ hg prev | 199 $ hg prev |
| 200 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 200 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 201 [3] added b (2) | 201 [3] added b (2) |
| 202 $ hg next | 202 $ hg next |
| 203 ambigious next changeset: | 203 ambiguous next changeset: |
| 204 [4] added c | 204 [4] added c |
| 205 [5] added d | 205 [5] added d |
| 206 explicitly update to one of them | 206 explicitly update to one of them |
| 207 [1] | 207 [1] |
| 208 | 208 |
| 213 $ hg next | 213 $ hg next |
| 214 no children | 214 no children |
| 215 (2 unstable changesets to be evolved here, do you want --evolve?) | 215 (2 unstable changesets to be evolved here, do you want --evolve?) |
| 216 [1] | 216 [1] |
| 217 $ hg next --evolve | 217 $ hg next --evolve |
| 218 ambigious next (unstable) changeset: | 218 ambiguous next (unstable) changeset: |
| 219 [4] added c | 219 [4] added c |
| 220 [5] added d | 220 [5] added d |
| 221 (run 'hg evolve --rev REV' on one of them) | 221 (run 'hg evolve --rev REV' on one of them) |
| 222 [1] | 222 [1] |
| 223 $ hg evolve -r 5 | 223 $ hg evolve -r 5 |