--- a/tests/test-stabilize-result.t Fri Mar 23 15:27:26 2018 +0530
+++ b/tests/test-stabilize-result.t Fri Mar 23 17:20:20 2018 +0530
@@ -186,6 +186,31 @@
|
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
+ # Parent 1cf0aacfd36310b18e403e1594871187e0364a82
+ phase-divergent update to 1cf0aacfd363:
+
+ newer a
+
+ diff -r 1cf0aacfd363 -r 3d968e0b3097 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 @@
+ a
+ 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
===============================================