Mercurial > evolve

comparison tests/test-prev-next.t @ 5892:34cd08a46b6d mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 20:01:39 +0800
parents fd039a7f0c3c 73167c42e601
children 91207a1c4dfa 0511ad9f0862
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
123 $ echo foo > modified-bar 123 $ echo foo > modified-bar
124 $ hg add modified-bar 124 $ hg add modified-bar
125 $ hg prev 125 $ hg prev
126 abort: uncommitted changes 126 abort: uncommitted changes
127 (do you want --merge?) 127 (do you want --merge?)
128 [20] 128 [255]
129 $ hg prev --merge 129 $ hg prev --merge
130 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 130 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
131 [0] added a 131 [0] added a
132 $ hg next 132 $ hg next
133 abort: uncommitted changes 133 abort: uncommitted changes
134 (do you want --merge?) 134 (do you want --merge?)
135 [20] 135 [255]
136 $ hg next --merge 136 $ hg next --merge
137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 137 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
138 [1] added b 138 [1] added b
139 139
140 Behavior with aspiring children 140 Behavior with aspiring children
378 $ echo babar > bar 378 $ echo babar > bar
379 379
380 $ hg next --evolve 380 $ hg next --evolve
381 abort: uncommitted changes 381 abort: uncommitted changes
382 (use `hg amend`, `hg revert` or `hg shelve`) 382 (use `hg amend`, `hg revert` or `hg shelve`)
383 [20] 383 [255]
384 384
385 $ cd .. 385 $ cd ..
386 386
387 Testing that `next` and `prev` respects `commands.update.check=noconflict` 387 Testing that `next` and `prev` respects `commands.update.check=noconflict`
388 388
469 Testing --merge works with other values of commands.update.check also 469 Testing --merge works with other values of commands.update.check also
470 470
471 $ hg prev --config commands.update.check=abort 471 $ hg prev --config commands.update.check=abort
472 abort: uncommitted changes 472 abort: uncommitted changes
473 (do you want --merge?) 473 (do you want --merge?)
474 [20] 474 [255]
475 $ hg prev --merge --config commands.update.check=abort 475 $ hg prev --merge --config commands.update.check=abort
476 file 'bar' was deleted in other [destination] but was modified in local [working copy]. 476 file 'bar' was deleted in other [destination] but was modified in local [working copy].
477 You can use (c)hanged version, (d)elete, or leave (u)nresolved. 477 You can use (c)hanged version, (d)elete, or leave (u)nresolved.
478 What do you want to do? 478 What do you want to do?
479 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 479 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
490 $ hg add bar 490 $ hg add bar
491 491
492 $ hg next --config commands.update.check=abort 492 $ hg next --config commands.update.check=abort
493 abort: uncommitted changes 493 abort: uncommitted changes
494 (do you want --merge?) 494 (do you want --merge?)
495 [20] 495 [255]
496 $ hg next --merge --config commands.update.check=abort 496 $ hg next --merge --config commands.update.check=abort
497 merging bar 497 merging bar
498 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') 498 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
499 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 499 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
500 use 'hg resolve' to retry unresolved file merges 500 use 'hg resolve' to retry unresolved file merges