Mercurial > evolve
view docs/evolve-good-practice.rst @ 3623:71fbb679e311
evolve: use the new rebased changeset to resolve phase-divergence
When there is a parent change in phase-divergence, `hg evolve` first rebases the
diveregent changeset on parent of public changeset and then continue the
resolution of phase-divergence *but* we used to continue with the old divergent
changeset rather than the new rebased one.
This patch makes sure we use the new rebased changeset to proceed with the
resolution. Tests changes shows that it fixes things which were broken earlier.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 23 Mar 2018 17:46:46 +0530 |
| parents | 016ffd74026f |
| children |
line wrap: on
line source
.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> .. Logilab SA <contact@logilab.fr> ----------------------------------------- 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.