Mercurial > evolve
view docs/evolve-good-practice.rst @ 349:9c156b9caa4f
obsolete: remove unused add2set/markerid functions
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Tue, 10 Jul 2012 15:14:58 +0200 |
| parents | 2f2681ed8f16 |
| children | b398e9c2dbd1 |
line wrap: on
line source
----------------------------------------- Good pratice for (early) user of evolve ----------------------------------------- Avoid instability -------------------------------- The less instability 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 constrainted to linear history. Making a branch per independent branch will help you avoiding instability and conflict. Rewrite you change only ------------------------------------------------ There is no descent conflict detection and handling right now. rewriting other people changeset garantee that you will get conflict. Communicate with you fellow developer before trying to touch other people part. (which is a good pratice in any case) Using multiple branch will help you to achieve this goal. Prefer pushing unstability than touching other people changeset ------------------------------------------------------------------ If you have children changeset from other people that you don't really care about, prefer not altering them that risking a conflict by stabilizing them. Do not get too confident --------------------------- This is an experimental extension and a complexe concept. This is beautiful, powerful and robust on paper. But the tool and your mind may not be prepared to all situation yet.