Mercurial > hg-website
annotate text/workflows.txt @ 118:a5c7422e4e4c
workflows, polishing.
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Fri, 24 Apr 2009 11:15:18 +0200 |
parents | f3bf81b67f7b |
children | f67bc89db328 |
rev | line source |
---|---|
102
fa153f85e455
workflows: Changed the title to 'Learning Mercurial in Workflows'.
Arne Babenhauserheide <bab@draketo.de>
parents:
101
diff
changeset
|
1 = Learning Mercurial in Workflows = |
97 | 2 |
116
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
3 == Intro == |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
4 |
97 | 5 With Mercurial you can use a multitude of different workflows. This page shows some of them, including their use cases. |
6 | |
7 It is intended to make it easier for you to create your own workflow. | |
8 | |
103
2bbea4b68181
workflows: minor text polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
102
diff
changeset
|
9 To write this page we gathered [real life workflows](wiki - workflows), so every more complex workflow in here has proven itself in real life usage. We begin with basic workflows and then go on to more complex examples. |
99
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
10 |
107
ee4b04bac02c
workflows: moved the workflow tutorial into learning_mercurial_in_workflows.txt and added a note pointing to that in workflows.txt
Arne Babenhauserheide <bab@draketo.de>
parents:
106
diff
changeset
|
11 The workflows on this page are rather terse to give you a good overview. You can find a longer introduction which shows how to use these workflows in [learning Mercurial in workflows](learning_mercurial_in_workflows). |
ee4b04bac02c
workflows: moved the workflow tutorial into learning_mercurial_in_workflows.txt and added a note pointing to that in workflows.txt
Arne Babenhauserheide <bab@draketo.de>
parents:
106
diff
changeset
|
12 |
99
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
13 <!--Structure: |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
14 * For whom? -> Why? |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
15 * What do you need? -> Resources + extensions |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
16 * Single Developer workflow |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
17 * Sharing changes. --> |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
18 |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
19 <!-- Plan |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
20 |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
21 * Simple workflows without extensions |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
22 |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
23 * Complex Workflows, including collaborative patch development and similar. |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
24 |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
25 * Smoothing workflows with extensions -> i.e. shelve before merging. |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
26 |
116
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
27 |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
28 Workflows: |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
29 |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
30 * One-off patch submission |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
31 * Lone Developer |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
32 * ... |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
33 |
99
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
34 --> |
71ff3b94b20d
Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents:
97
diff
changeset
|
35 |
116
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
36 == Workflows == |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
37 |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
38 === One-off patch submission === |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
39 |
117
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
40 ==== For whom? ==== |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
41 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
42 If you just want to submit a short patch to a project, this workflow is right for you. |
116
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
43 |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
44 ==== Requirements ==== |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
45 |
117
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
46 You need just Mercurial (command line) and an email address to which you can send the patch. |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
47 |
116
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
48 ==== Flow ==== |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
49 |
117
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
50 First get the repository |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
51 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
52 $ hg clone http://hg-scm.org/hello |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
53 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
54 Now do and commit your changes |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
55 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
56 $ cd hello |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
57 $ (edit files) |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
58 $ hg add (new files) |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
59 $ hg commit -m 'short descriptioni of the changes' |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
60 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
61 Export your patch |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
62 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
63 $ hg export tip > patch.diff |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
64 |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
65 And send patch.diff to the developers email address, ideally with a description what your patch does and why it's important. |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
66 |
118
a5c7422e4e4c
workflows, polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
117
diff
changeset
|
67 Note: "tip" is the most current revision in your repository. |
a5c7422e4e4c
workflows, polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
117
diff
changeset
|
68 |
117
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
69 ==== Modifications ==== |
f3bf81b67f7b
workflows: Added the basic patch submission workflow.
Arne Babenhauserheide <bab@draketo.de>
parents:
116
diff
changeset
|
70 |
118
a5c7422e4e4c
workflows, polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
117
diff
changeset
|
71 You can also upload the patch, for example to a bugtracker. It's just a simple file after all. |
116
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
72 |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
73 == Lone Developer == |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
74 |
7666e300f284
Added preliminary plan for a list of workflows.
Arne Babenhauserheide <bab@draketo.de>
parents:
107
diff
changeset
|
75 ... |