diff tests/test-stabilize-result.t @ 3623:71fbb679e311

evolve: use the new rebased changeset to resolve phase-divergence

When there is a parent change in phase-divergence, `hg evolve` first rebases the
diveregent changeset on parent of public changeset and then continue the
resolution of phase-divergence *but* we used to continue with the old divergent
changeset rather than the new rebased one.

This patch makes sure we use the new rebased changeset to proceed with the
resolution. Tests changes shows that it fixes things which were broken earlier.

--- a/tests/test-stabilize-result.t	Fri Mar 23 17:21:09 2018 +0530
+++ b/tests/test-stabilize-result.t	Fri Mar 23 17:46:46 2018 +0530
@@ -173,10 +173,10 @@
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
   computing new diff
-  committed as 3d968e0b3097
-  working directory is now at 3d968e0b3097
+  committed as 8fc63fe1f297
+  working directory is now at 8fc63fe1f297
   $ glog
-  @  11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+  @  11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
   |
   | o  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -186,19 +186,18 @@
   |
   o  0:07f494440405@default(public) bk:[] adda
   
-XXX: c addition should not be part of this patch
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 3d968e0b3097ef69b104ff2e1af43fce665feb0a
+  # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74
   # Parent  1cf0aacfd36310b18e403e1594871187e0364a82
   phase-divergent update to 1cf0aacfd363:
   
   newer a
   
-  diff -r 1cf0aacfd363 -r 3d968e0b3097 a
+  diff -r 1cf0aacfd363 -r 8fc63fe1f297 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,3 +1,4 @@
@@ -206,18 +205,13 @@
    a
    newer a
   +babar
-  diff -r 1cf0aacfd363 -r 3d968e0b3097 c
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +c
 
 Stabilize divergent changesets with same parent
 ===============================================
 
   $ rm a.orig
   $ hg up 7bc2f5967f5e
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat << EOF >> a
   > flore
   > arthur
@@ -230,7 +224,7 @@
   $ glog
   @  12:3932c176bbaa@default(draft) bk:[] More addition
   |
-  | o  11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+  | o  11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
   | |
   o |  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -259,7 +253,7 @@
   |
   | *  13:d2f173e25686@default(draft) bk:[] More addition
   |/
-  | o  11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+  | o  11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
   | |
   o |  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |
@@ -309,7 +303,7 @@
   $ glog
   @  15:f344982e63c4@default(draft) bk:[] More addition
   |
-  | o  11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+  | o  11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
   | |
   o |  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |