--- a/tests/test-evolve-content-divergence.t Tue Mar 05 20:07:23 2019 +0530
+++ b/tests/test-evolve-content-divergence.t Tue Mar 05 21:15:05 2019 +0530
@@ -929,8 +929,13 @@
() [default] draft
-Test to make sure that evolve don't fall into unrecoverable state (issue6053):
+Test to make sure that evolve don't fall into unrecoverable state (issue6053)
------------------------------------------------------------------------------
+
+It happened when two divergent csets has different parent (need relocation)
+and resolution parent is obsolete. So this issue triggered when during
+relocation we hit conflicts. So lets make the repo as described.
+
$ cd ..
$ hg init localside
$ cd localside
@@ -954,18 +959,21 @@
$ echo ee > e
$ hg amend -m "updated e"
+ $ hg up 1 -q
- $ hg up 1 -q
+To make sure we hit conflict while relocating
$ echo dd > d
$ echo ee > e
$ hg add d e
$ hg ci -m "updated e"
created new head
+Lets create divergence
$ hg prune 4 -s . --hidden
1 changesets pruned
2 new content-divergent changesets
+Making obsolete resolution parent
$ hg prune 3
1 changesets pruned
1 new orphan changesets