diff tests/test-evolve.t @ 4122:4eb3877540f1

evovle: remove redundancy in evolve output

Copying the discription of this redundancy issue given by Pierre Yves David:

When running `hg evolve` to stabilize orphan changeset output about the
currently stabilized changeset is issued. For example:

$ hg evolve
  move:[3] a3
  atop:[4] a2
  working directory is now at 7c5649f73d11

This output can become quite repetitive when orphan are stabilized atop
each other. For example:

$ hg evolve --all
  move:[8] dansk 2!
  atop:[10] dansk!
  merging main-file-1
  move:[9] dansk 3!
  atop:[11] dansk 2!

In this case it would be smoother to issue:

$ hg evolve --all
  move:[8] dansk 2!
  atop:[10] dansk!
  merging main-file-1
  move:[9] dansk 3!

Since we are moving "dansk 3!" atop the changeset we just stabilized.

When adding this be careful that we still want to issue the "atop" message
in various cases:

  1. first changesets in a stack
  2. when the orphan is not stabilized atop previous one
  3. when using hg evolve --continue to resume an evolution

So, I have made the changes which also respect above listed three points.
And changes in tests/test-evovle*.t reflecting the changed behavior.

--- a/tests/test-evolve.t	Tue Sep 18 02:14:10 2018 +0200
+++ b/tests/test-evolve.t	Fri Sep 21 15:52:53 2018 +0530
@@ -468,7 +468,6 @@
   atop:[10] dansk!
   merging main-file-1
   move:[9] dansk 3!
-  atop:[11] dansk 2!
   merging main-file-1
   working directory is now at 96abb1319a47
   $ hg log -G
@@ -1291,7 +1290,6 @@
   move:[20] add j2
   atop:[23] add j1
   move:[21] add j3
-  atop:[24] add j2
   working directory is now at 0d9203b74542
   $ glog -r "0cf3707e8971::"
   @  25:0d9203b74542@default(draft) add j3
@@ -1465,7 +1463,6 @@
   move:[35] will be evolved safely
   atop:[37] amended
   move:[36] will cause conflict at evolve
-  atop:[38] will be evolved safely
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`