# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1621081673 -28800
# Node ID 126b9be3482d849c08c82cd32e0a42f6d49eeec3
# Parent  3571685e2aa2e5893bff9c32f2eadea69d423730
tests: demonstrate current behavior of hg next with --merge and --evolve

diff -r 3571685e2aa2 -r 126b9be3482d tests/test-prev-next.t
--- a/tests/test-prev-next.t	Sun May 02 22:06:11 2021 +0800
+++ b/tests/test-prev-next.t	Sat May 15 20:27:53 2021 +0800
@@ -608,3 +608,58 @@
   move:[4] B
   atop:[5] B modified
   working directory is now at 1b434459c7e7
+
+  $ cd ..
+
+Testing --merge and --evolve flags: 1 child, 1 aspchild, dirty working copy
+
+  $ hg init next-dirty-evolve
+  $ cd next-dirty-evolve
+
+  $ echo apple > a
+  $ hg ci -qAm apple
+  $ echo banana > b
+  $ hg ci -qAm banana
+  $ echo coconut > c
+  $ hg ci -qAm coconut
+
+  $ hg prev
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  [1] banana
+  $ echo blueberry > b
+  $ hg ci --amend -m blueberry
+  1 new orphan changesets
+
+  $ echo durian > d
+  $ hg ci -qAm durian
+  $ hg log -GT "{rev} {desc}\n"
+  @  4 durian
+  |
+  o  3 blueberry
+  |
+  | *  2 coconut
+  | |
+  | x  1 banana
+  |/
+  o  0 apple
+  
+
+  $ hg up 'desc("blueberry")'
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo avocado > a
+
+  $ hg next --no-merge --evolve --dry-run
+  abort: uncommitted changes
+  (use `hg amend`, `hg revert` or `hg shelve`)
+  [20]
+  $ hg next --no-merge --no-evolve --dry-run
+  abort: uncommitted changes
+  (do you want --merge?)
+  [20]
+  $ hg next --merge --no-evolve --dry-run
+  hg update db0dc1f00682;
+  [4] durian
+  $ hg next --merge --evolve --dry-run
+  abort: uncommitted changes
+  (use `hg amend`, `hg revert` or `hg shelve`)
+  [20]