1 .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
1 .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
2 .. Logilab SA <contact@logilab.fr> |
2 .. Logilab SA <contact@logilab.fr> |
3 |
3 |
4 ----------------------------------------- |
4 ----------------------------------------- |
5 Good pratice for (early) user of evolve |
5 Good practice for (early) users of evolve |
6 ----------------------------------------- |
6 ----------------------------------------- |
7 |
7 |
8 Avoid unstability |
8 Avoid unstability |
9 -------------------------------- |
9 -------------------------------- |
10 |
10 |
14 not ready neither. |
14 not ready neither. |
15 |
15 |
16 Branch as much as possible |
16 Branch as much as possible |
17 -------------------------------- |
17 -------------------------------- |
18 |
18 |
19 This is not MQ, you are not constrainted to linear history. |
19 This is not MQ; you are not constrained to linear history. |
20 |
20 |
21 Making a branch per independent branch will help you avoid unstability |
21 Making a branch per independent branch will help you avoid unstability |
22 and conflict. |
22 and conflict. |
23 |
23 |
24 Rewrite you change only |
24 Rewrite your changes only |
25 ------------------------------------------------ |
25 ------------------------------------------------ |
26 |
26 |
27 There is no descent conflict detection and handling right now. |
27 There is no descent conflict detection and handling right now. |
28 Rewriting other people's changesets guarantees that you will get |
28 Rewriting other people's changesets guarantees that you will get |
29 conflicts. Communicate with your fellow developers before trying to |
29 conflicts. Communicate with your fellow developers before trying to |
30 touch other people's work (which is a good pratice in any case). |
30 touch other people's work (which is a good pratice in any case). |
31 |
31 |
32 Using multiple branch will help you to achieve this goal. |
32 Using multiple branches will help you to achieve this goal. |
33 |
33 |
34 Prefer pushing unstability than touching other people changeset |
34 Prefer pushing unstability to touching other people changesets |
35 ------------------------------------------------------------------ |
35 -------------------------------------------------------------- |
36 |
36 |
37 |
37 |
38 If you have children changesets from other people that you don't really care |
38 If you have children changesets from other people that you don't really care |
39 about, prefer not altering them to risking a conflict by stabilizing them. |
39 about, prefer not altering them to risking a conflict by stabilizing them. |
40 |
40 |