Mercurial > evolve

comparison tests/test-prev-next.t @ 6064:28a77df6e41f mercurial-5.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.8 into mercurial-5.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:15:44 +0300
parents 6cdea542b6ea b68789e8c535
children c0921b5277a0 0042d69b8648
comparison
equal deleted inserted replaced
5996:91c3a9dd5f77 6064:28a77df6e41f
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
228 [3] added b (2) 228 [3] added b (2)
229 229
230 next with ambiguity in aspiring children 230 next with ambiguity in aspiring children
231 231
232 $ hg am -m 'added b (3)' 232 $ hg amend -m 'added b (3)'
233 2 new orphan changesets 233 2 new orphan changesets
234 $ hg next --no-evolve 234 $ hg next --no-evolve
235 no children 235 no children
236 (2 unstable changesets to be evolved here, do you want --evolve?) 236 (2 unstable changesets to be evolved here, do you want --evolve?)
237 [1] 237 [1]
562 @@ -0,0 +1,1 @@ 562 @@ -0,0 +1,1 @@
563 +bbbbb 563 +bbbbb
564 record this change to 'b'? 564 record this change to 'b'?
565 (enter ? for help) [Ynesfdaq?] y 565 (enter ? for help) [Ynesfdaq?] y
566 566
567 no more change to split 567 no more changes to split
568 1 new orphan changesets 568 1 new orphan changesets
569 569
570 $ hg up 3 -q 570 $ hg up 3 -q
571 $ hg log -GT "{rev}:{node|short} {desc}\n" 571 $ hg log -GT "{rev}:{node|short} {desc}\n"
572 o 4:279f6cab32b5 B 572 o 4:279f6cab32b5 B
606 > q 606 > q
607 > EOF 607 > EOF
608 move:[4] B 608 move:[4] B
609 atop:[5] B modified 609 atop:[5] B modified
610 working directory is now at 1b434459c7e7 610 working directory is now at 1b434459c7e7
611
612 $ cd ..
613
614 hg next --abort
615
616 $ hg init next-abort
617 $ cd next-abort
618
619 $ echo apple > a
620 $ hg ci -qAm apple
621 $ echo banana > b
622 $ hg ci -qAm banana
623 $ hg up 0
624 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
625 $ echo blueberry > b
626 $ hg ci -qAm 'apple and blueberry' --amend
627 1 new orphan changesets
628
629 $ hg next
630 move:[1] banana
631 atop:[2] apple and blueberry
632 merging b
633 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
634 unresolved merge conflicts
635 (see 'hg help evolve.interrupted')
636 [240]
637
638 $ hg next --abort
639 next aborted
640 working directory is now at 1c7f51cf0ef0
641 $ hg next --abort
642 abort: no interrupted next to abort
643 [255]
644 $ hg evolve --abort
645 abort: no interrupted evolve to abort
646 [255]
647
648 $ hg next --abort --move-bookmark
649 abort: cannot specify both --abort and --move-bookmark
650 [10]
651 $ hg next --abort --merge
652 abort: cannot specify both --abort and --merge
653 [10]
611 654
612 $ cd .. 655 $ cd ..
613 656
614 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
615 658