Commit 207427ed authored by Anton Shestakov's avatar Anton Shestakov
Browse files

tests: demonstrate that evolve swaps parents of merge commits

Tests currently pass, don't forget to change FIXME items.
parent dd68ce259708
......@@ -30,6 +30,8 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo foo > b
$ hg ci -Aqm "added b"
$ hg up c7586e2a9264
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
......@@ -45,6 +47,18 @@
o 0:8fa14d15e168 added hgignore
() draft
Checking issue6141 while at it: p1 is 1 and p2 is 2
$ hg parents
changeset: 3:3b2b6f4652ee
tag: tip
parent: 1:c7586e2a9264
parent: 2:d76850646258
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: merging a and b
Testing with obsoleting the second parent
$ hg up d76850646258
......@@ -80,6 +94,8 @@
o 0:8fa14d15e168 added hgignore
() draft
Following issue6141: FIXME: p2 is now 1
$ hg parents
changeset: 5:91fd62122a4b
tag: tip
......
Supports Markdown
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