Mercurial > evolve
annotate docs/evolve-good-practice.rst @ 531:b18b00036355 stable 1.0.0
pkg/debian: Debian packaging
This change add the necessary files to create a debian package for the evolve
extension. I do not care about the rest.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Wed, 29 Aug 2012 11:36:10 +0200 |
parents | b81193ef3488 |
children | dd5765ae91c3 |
rev | line source |
---|---|
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> |
527
b81193ef3488
docs: add missing blank line after Copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
519
diff
changeset
|
3 |
241 | 4 ----------------------------------------- |
5 Good pratice for (early) user of evolve | |
6 ----------------------------------------- | |
7 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
8 Avoid unstability |
241 | 9 -------------------------------- |
10 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
11 The less unstability you have the less you need to resolve. |
241 | 12 |
13 Evolve is not yet able to detect and solve every situation. And your mind is | |
14 not ready neither. | |
15 | |
16 Branch as much as possible | |
17 -------------------------------- | |
18 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
19 This is not MQ, you are not constrainted to linear history. |
241 | 20 |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
21 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
|
22 and conflict. |
241 | 23 |
24 Rewrite you change only | |
25 ------------------------------------------------ | |
26 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
27 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
|
28 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
|
29 conflicts. Communicate with your fellow developers before trying to |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
30 touch other people's work (which is a good pratice in any case). |
241 | 31 |
32 Using multiple branch will help you to achieve this goal. | |
33 | |
34 Prefer pushing unstability than touching other people changeset | |
35 ------------------------------------------------------------------ | |
36 | |
37 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
38 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
|
39 about, prefer not altering them to risking a conflict by stabilizing them. |
241 | 40 |
41 | |
42 Do not get too confident | |
43 --------------------------- | |
44 | |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
241
diff
changeset
|
45 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
|
46 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
|
47 all situations yet. |