Commit 96c652c6 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: demonstrate current behavior of hg next with --merge and --evolve

--HG--
branch : stable
parent 3571685e2aa2
......@@ -608,3 +608,58 @@ Add test which shows that now `next` command does not get confused by split:
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]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment