equal
deleted
inserted
replaced
34 TODO |
34 TODO |
35 |
35 |
36 === Using (named) branches === |
36 === Using (named) branches === |
37 Branches are alternative commit histories. Changes done in one branch can be merged into other branches as needed. |
37 Branches are alternative commit histories. Changes done in one branch can be merged into other branches as needed. |
38 |
38 |
39 Most main development happens on the main repository branch "default". |
39 _Most main development happens on the main repository branch "default"._ |
40 |
40 |
41 |
41 |
42 We prefer not to use separate branches for little patches, as branches are permanent and will clutter the list of {{{hg branches}}}. |
42 We prefer *not* to use separate branches for little patches, as branches are permanent and will clutter the list of {{{hg branches}}}. |
43 |
43 |
44 So for small code contributions, use "unnamed branches" instead (see below). |
44 *So for small code contributions, use "unnamed branches" instead (see below).* |
45 |
45 |
46 However, if you are going to write code that is more a project than a patch and that will take dozens of commits, feel free to do that work on a new branch. |
46 _However, if you are going to write code that is more a project than a patch and that will take dozens of commits, feel free to do that work on a new branch._ |
47 |
47 |
48 To create a new branch use {{{hg branch}}} followed by the name of the new branch, before committing the first code. |
48 To create a new branch use {{{hg branch}}} followed by the name of the new branch, before committing the first code. |
49 |
49 |
50 |
50 |
51 |
51 |