Mercurial > evolve
annotate docs/evolve-good-practice.rst @ 474:5c031e1c90e2 stable
test: turn the base public
usefull for followup that test phases enforcement.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 21 Aug 2012 12:38:19 +0200 |
parents | b398e9c2dbd1 |
children | 9825c7da5b54 |
rev | line source |
---|---|
241 | 1 ----------------------------------------- |
2 Good pratice for (early) user of evolve | |
3 ----------------------------------------- | |
4 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
5 Avoid unstability |
241 | 6 -------------------------------- |
7 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
8 The less unstability you have the less you need to resolve. |
241 | 9 |
10 Evolve is not yet able to detect and solve every situation. And your mind is | |
11 not ready neither. | |
12 | |
13 Branch as much as possible | |
14 -------------------------------- | |
15 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
16 This is not MQ, you are not constrainted to linear history. |
241 | 17 |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
18 Making a branch per independent branch will help you avoid unstability |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
19 and conflict. |
241 | 20 |
21 Rewrite you change only | |
22 ------------------------------------------------ | |
23 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
24 There is no descent conflict detection and handling right now. |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
25 Rewriting other people's changesets guarantees that you will get |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
26 conflicts. Communicate with your fellow developers before trying to |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
27 touch other people's work (which is a good pratice in any case). |
241 | 28 |
29 Using multiple branch will help you to achieve this goal. | |
30 | |
31 Prefer pushing unstability than touching other people changeset | |
32 ------------------------------------------------------------------ | |
33 | |
34 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
35 If you have children changesets from other people that you don't really care |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
36 about, prefer not altering them to risking a conflict by stabilizing them. |
241 | 37 |
38 | |
39 Do not get too confident | |
40 --------------------------- | |
41 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
42 This is an experimental extension and a complex concept. This is beautiful, |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
43 powerful and robust on paper, but the tool and your mind may not be prepared for |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
44 all situations yet. |