diff tests/test-evolve-content-divergent-relocation.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-content-divergent-relocation.t	Sat Apr 27 17:11:12 2019 +0800
+++ b/tests/test-evolve-content-divergent-relocation.t	Fri Apr 26 01:20:08 2019 +0530
@@ -69,8 +69,6 @@
   with: [6] added b
   base: [2] added b
   rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264
-  updating to "local" side of the conflict: 7ed0642d644b
-  merging "other" content-divergent changeset '11f849d7159f'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 171614c9a791
 
@@ -167,8 +165,6 @@
   with: [12] added foo to x
   base: [11] added x
   rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8
-  updating to "local" side of the conflict: 1e4f6b3bb39b
-  merging "other" content-divergent changeset '80cc9b1ec650'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at b006cf317e0e
 
@@ -256,8 +252,6 @@
   with: [17] added y
   base: [16] added y
   rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e
-  updating to "local" side of the conflict: b4575ed6fcfc
-  merging "other" content-divergent changeset '48f745db3f53'
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -421,8 +415,6 @@
 
   $ hg evolve --continue
   evolving 23:3f7a1f693080 "added z"
-  updating to "local" side of the conflict: 53242575ffa9
-  merging "other" content-divergent changeset 'cdb0643c69fc'
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved