Mercurial > evolve

comparison tests/test-prev-next.t @ 6065:c0921b5277a0 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 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:32:36 +0300
parents 0511ad9f0862 28a77df6e41f
children e82ad19eb3cc 3b486ae2e79a
comparison
equal deleted inserted replaced
6064:28a77df6e41f 6065:c0921b5277a0
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
631 atop:[2] apple and blueberry 631 atop:[2] apple and blueberry
632 merging b 632 merging b
633 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 633 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
634 unresolved merge conflicts 634 unresolved merge conflicts
635 (see 'hg help evolve.interrupted') 635 (see 'hg help evolve.interrupted')
636 [240] 636 [1]
637 637
638 $ hg next --abort 638 $ hg next --abort
639 next aborted 639 next aborted
640 working directory is now at 1c7f51cf0ef0 640 working directory is now at 1c7f51cf0ef0
641 $ hg next --abort 641 $ hg next --abort
645 abort: no interrupted evolve to abort 645 abort: no interrupted evolve to abort
646 [255] 646 [255]
647 647
648 $ hg next --abort --move-bookmark 648 $ hg next --abort --move-bookmark
649 abort: cannot specify both --abort and --move-bookmark 649 abort: cannot specify both --abort and --move-bookmark
650 [10] 650 [255]
651 $ hg next --abort --merge 651 $ hg next --abort --merge
652 abort: cannot specify both --abort and --merge 652 abort: cannot specify both --abort and --merge
653 [10] 653 [255]
654 654
655 $ cd .. 655 $ cd ..
656 656
657 Testing --merge and --evolve flags: 1 child, 1 aspchild, dirty working copy 657 Testing --merge and --evolve flags: 1 child, 1 aspchild, dirty working copy
658 658
692 $ echo avocado > a 692 $ echo avocado > a
693 693
694 $ hg next --no-merge --evolve --dry-run 694 $ hg next --no-merge --evolve --dry-run
695 abort: uncommitted changes 695 abort: uncommitted changes
696 (use `hg amend`, `hg revert` or `hg shelve`) 696 (use `hg amend`, `hg revert` or `hg shelve`)
697 [20] 697 [255]
698 $ hg next --no-merge --no-evolve --dry-run 698 $ hg next --no-merge --no-evolve --dry-run
699 abort: uncommitted changes 699 abort: uncommitted changes
700 (do you want --merge?) 700 (do you want --merge?)
701 [20] 701 [255]
702 $ hg next --merge --no-evolve --dry-run 702 $ hg next --merge --no-evolve --dry-run
703 hg update db0dc1f00682; 703 hg update db0dc1f00682;
704 [4] durian 704 [4] durian
705 $ hg next --merge --evolve --dry-run 705 $ hg next --merge --evolve --dry-run
706 abort: uncommitted changes 706 abort: uncommitted changes
707 (use `hg amend`, `hg revert` or `hg shelve`) 707 (use `hg amend`, `hg revert` or `hg shelve`)
708 [20] 708 [255]