Mercurial > evolve

comparison docs/evolve-good-practice.rst @ 357:b398e9c2dbd1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: English proofreading
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 11 Jul 2012 13:59:06 -0400
parents 2f2681ed8f16
children 9825c7da5b54
comparison
equal deleted inserted replaced
345:62de989b2a02 357:b398e9c2dbd1
1 ----------------------------------------- 1 -----------------------------------------
2 Good pratice for (early) user of evolve 2 Good pratice for (early) user of evolve
3 ----------------------------------------- 3 -----------------------------------------
4 4
5 Avoid instability 5 Avoid unstability
6 -------------------------------- 6 --------------------------------
7 7
8 The less instability you have the less you need to resolve. 8 The less unstability you have the less you need to resolve.
9 9
10 Evolve is not yet able to detect and solve every situation. And your mind is 10 Evolve is not yet able to detect and solve every situation. And your mind is
11 not ready neither. 11 not ready neither.
12 12
13 Branch as much as possible 13 Branch as much as possible
14 -------------------------------- 14 --------------------------------
15 15
16 This is not MQ you are not constrainted to linear history. 16 This is not MQ, you are not constrainted to linear history.
17 17
18 Making a branch per independent branch will help you avoiding instability and conflict. 18 Making a branch per independent branch will help you avoid unstability
19 and conflict.
19 20
20 Rewrite you change only 21 Rewrite you change only
21 ------------------------------------------------ 22 ------------------------------------------------
22 23
23 There is no descent conflict detection and handling right now. rewriting other 24 There is no descent conflict detection and handling right now.
24 people changeset garantee that you will get conflict. Communicate with you 25 Rewriting other people's changesets guarantees that you will get
25 fellow developer before trying to touch other people part. (which is a good 26 conflicts. Communicate with your fellow developers before trying to
26 pratice in any case) 27 touch other people's work (which is a good pratice in any case).
27 28
28 Using multiple branch will help you to achieve this goal. 29 Using multiple branch will help you to achieve this goal.
29 30
30 Prefer pushing unstability than touching other people changeset 31 Prefer pushing unstability than touching other people changeset
31 ------------------------------------------------------------------ 32 ------------------------------------------------------------------
32 33
33 34
34 If you have children changeset from other people that you don't really care 35 If you have children changesets from other people that you don't really care
35 about, prefer not altering them that risking a conflict by stabilizing them. 36 about, prefer not altering them to risking a conflict by stabilizing them.
36 37
37 38
38 Do not get too confident 39 Do not get too confident
39 --------------------------- 40 ---------------------------
40 41
41 This is an experimental extension and a complexe concept. This is beautiful, 42 This is an experimental extension and a complex concept. This is beautiful,
42 powerful and robust on paper. But the tool and your mind may not be prepared to 43 powerful and robust on paper, but the tool and your mind may not be prepared for
43 all situation yet. 44 all situations yet.