# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1611499168 -19800
# Node ID 961a940aef578e4ce502b603916822d7dc7a49f5
# Parent  32c0b2899fc4104f1328a2f77ebc34d7507ff270
divergence-resolution: [patch 3] fix a messed up test case

Because of logic change in divergence resolution which causes the order change
in picking the resolution parent this test case was messed up.

It was supposed to test that it hits merge conflict while merging the
two divergent csets but because of some change in previous patches, we hit
conflict early during relocation of one of the cset.

This patch, by resolving the conflict for relocation make sure that we test
the conflict while merging the two divergent csets.

diff -r 32c0b2899fc4 -r 961a940aef57 tests/test-evolve-content-divergent-interrupted.t
--- a/tests/test-evolve-content-divergent-interrupted.t	Sun Jan 24 20:09:02 2021 +0530
+++ b/tests/test-evolve-content-divergent-interrupted.t	Sun Jan 24 20:09:28 2021 +0530
@@ -373,6 +373,24 @@
   (see 'hg help evolve.interrupted')
   [240]
 
+this test case is mainly to test that we hit merge conlict while merging the
+two divergent csets, so resolving this one which happened during relocation
+  $ echo a > a
+  $ hg res -m
+  (no more unresolved files)
+  continue: hg evolve --continue
+
+  $ hg evolve -c
+  evolving 8:a8673909e314 "added d"
+  merging a
+  merging d
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 2 files unresolved
+  unresolved merge conflicts
+  (see 'hg help evolve.interrupted')
+  [240]
+
   $ hg evolve --abort
   evolve aborted
   working directory is now at b6a3f3ee0c44