tests/test-evolve-public-content-divergent.t
changeset 4438 a6bdb02a1902
parent 4418 0ec30a7d9e12
child 4444 ea336a6592cc
--- a/tests/test-evolve-public-content-divergent.t	Sun Mar 10 18:00:08 2019 +0100
+++ b/tests/test-evolve-public-content-divergent.t	Sat Mar 09 19:25:34 2019 +0530
@@ -867,6 +867,7 @@
   base: [2] added c
   merging "other" content-divergent changeset '90522bccf499'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  content-divergent changesets differ by descriptions only, discarding 90522bccf499
 
   $ hg evolve -l
 
@@ -962,6 +963,7 @@
   updating to "local" side of the conflict: e800202333a4
   merging "other" content-divergent changeset 'ae3429430ef1'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  content-divergent changesets differ by descriptions only, discarding ae3429430ef1
 
   $ hg evolve -l
 
@@ -1069,6 +1071,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
+  content-divergent changesets differ by descriptions only, discarding 229da2719b19
   working directory is now at f7c1071f1e7c
 
   $ hg evolve -l
@@ -1176,6 +1179,7 @@
   updating to "local" side of the conflict: e800202333a4
   merging "other" content-divergent changeset 'bc309da55b88'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  content-divergent changesets differ by descriptions only, discarding bc309da55b88
   working directory is now at e800202333a4
 
   $ hg evolve -l
@@ -1281,6 +1285,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
+  content-divergent changesets differ by descriptions only, discarding a5bbf2042450
   working directory is now at e800202333a4
 
   $ hg evolve -l
@@ -1400,6 +1405,7 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
+  content-divergent changesets differ by descriptions only, discarding 09054d1f3c97
   working directory is now at e800202333a4
 
   $ hg evolve -l