author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
Mon, 27 Aug 2012 15:16:47 +0200 | |
branch | stable |
changeset 524 | ba0a3d0f942f |
parent 519 | 9825c7da5b54 |
child 527 | b81193ef3488 |
permissions | -rw-r--r-- |
519
9825c7da5b54
ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
357
diff
changeset
|
1 |
.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
9825c7da5b54
ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
357
diff
changeset
|
2 |
.. Logilab SA <contact@logilab.fr> |
241 | 3 |
----------------------------------------- |
4 |
Good pratice for (early) user of evolve |
|
5 |
----------------------------------------- |
|
6 |
||
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
7 |
Avoid unstability |
241 | 8 |
-------------------------------- |
9 |
||
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
10 |
The less unstability you have the less you need to resolve. |
241 | 11 |
|
12 |
Evolve is not yet able to detect and solve every situation. And your mind is |
|
13 |
not ready neither. |
|
14 |
||
15 |
Branch as much as possible |
|
16 |
-------------------------------- |
|
17 |
||
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
18 |
This is not MQ, you are not constrainted to linear history. |
241 | 19 |
|
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
20 |
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
|
21 |
and conflict. |
241 | 22 |
|
23 |
Rewrite you change only |
|
24 |
------------------------------------------------ |
|
25 |
||
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
26 |
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
|
27 |
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
|
28 |
conflicts. Communicate with your fellow developers before trying to |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
29 |
touch other people's work (which is a good pratice in any case). |
241 | 30 |
|
31 |
Using multiple branch will help you to achieve this goal. |
|
32 |
||
33 |
Prefer pushing unstability than touching other people changeset |
|
34 |
------------------------------------------------------------------ |
|
35 |
||
36 |
||
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
37 |
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
|
38 |
about, prefer not altering them to risking a conflict by stabilizing them. |
241 | 39 |
|
40 |
||
41 |
Do not get too confident |
|
42 |
--------------------------- |
|
43 |
||
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
44 |
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
|
45 |
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
|
46 |
all situations yet. |