diff tests/test-evolve-public-content-divergent-corner-cases.t @ 4633:61c2518cd6d2

evolve: move status msg to verbose mode in content-divergence resolution

As suggested by Pierre-Yves, lets move these too verbose message for the user
to verbose mode to decrease some noise.

--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Fri Apr 26 01:20:08 2019 +0530
@@ -134,8 +134,6 @@
   with: [5] updated c
   base: [2] added c
   rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
-  updating to "local" side of the conflict: c0d7ee6604ea
-  merging "other" content-divergent changeset 'c3d442d80993'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   committed as 3b336cbee992
   working directory is now at 3b336cbee992
@@ -417,8 +415,6 @@
 
   $ hg evolve --continue
   evolving 4:e568fd1029bb "added c e"
-  updating to "local" side of the conflict: 93cd84bbdaca
-  merging "other" content-divergent changeset '2af3359250d3'
   file 'd' was deleted in other but was modified in local.
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
@@ -639,16 +635,12 @@
   with: [9] c_E
   base: [5] c_E
   rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
-  updating to "local" side of the conflict: c7d2d47c7240
-  merging "other" content-divergent changeset '0773642cfa95'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95
   merge:[8] c_F
   with: [10] c_F
   base: [6] c_F
   rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240
-  updating to "local" side of the conflict: a52ac76b45f5
-  merging "other" content-divergent changeset '6a87ed4aa317'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergence resolution between a52ac76b45f5 (public) and 6a87ed4aa317 has same content as a52ac76b45f5, discarding 6a87ed4aa317
   $ hg sum