diff tests/test-evolve-abort-phasediv.t @ 3978:fb8e44c70798 stable

evolve: set the second parent if we get conflicts while evolving

This patch makes sure we set the second parent correctly if we run into
conflicts while evolving. Also, we need to make sure to reset to one parent
before committing.

--- a/tests/test-evolve-abort-phasediv.t	Sat Aug 18 21:01:14 2018 +0530
+++ b/tests/test-evolve-abort-phasediv.t	Sat Aug 18 21:03:45 2018 +0530
@@ -114,6 +114,14 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     added c
   
+  changeset:   6:ddba58020bc0
+  tag:         tip
+  parent:      1:c7586e2a9264
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  instability: phase-divergent
+  summary:     added d
+  
 
   $ hg evolve --abort
   evolve aborted