equal
deleted
inserted
replaced
13 == Using a mercurial clone == |
13 == Using a mercurial clone == |
14 |
14 |
15 TODO |
15 TODO |
16 |
16 |
17 === Using (named) branches === |
17 === Using (named) branches === |
18 Branches are alternative commit histories. Changes done in one branch can be merged into other branches as needed. |
18 Branches are alternative commit histories. |
|
19 |
|
20 The commits history from one branch, up to any commit, can be merged into other branches when needed. |
|
21 Note: In Mercurial merging a commit always means to also merge all its ancestor commits. |
19 |
22 |
20 _Most main development happens on the main repository branch "default"._ |
23 _Most main development happens on the main repository branch "default"._ |
21 |
24 |
22 |
25 |
23 We prefer *not* to use separate branches for little patches, as branches are permanent and will clutter the list of {{{hg branches}}}. |
26 We prefer *not* to use separate branches for little patches, as branches are permanent and will clutter the list of {{{hg branches}}}. |