view docs/evolve-good-practice.rst @ 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.

.. Copyright 2011 Pierre-Yves David <[e-mail]>
..                Logilab SA        <[e-mail]>

-----------------------------------------
Good practice for (early) users of evolve
-----------------------------------------

Avoid unstability
-----------------

The less unstability you have the less you need to resolve.

Evolve is not yet able to detect and solve every situation. And your mind is
not ready neither.

Branch as much as possible
--------------------------

This is not MQ; you are not constrained to linear history.

Making a branch per independent branch will help you avoid unstability
and conflict.

Rewrite your changes only
-------------------------

There is no descent conflict detection and handling right now.
Rewriting other people's changesets guarantees that you will get
conflicts. Communicate with your fellow developers before trying to
touch other people's work (which is a good practice in any case).

Using multiple branches will help you to achieve this goal.

Prefer pushing unstability to touching other people changesets
--------------------------------------------------------------


If you have children changesets from other people that you don't really care
about, prefer not altering them to risking a conflict by stabilizing them.


Do not get too confident
------------------------

This is an experimental extension and a complex concept. This is beautiful,
powerful and robust on paper, but the tool and your mind may not be prepared for
all situations yet.