annotate hgscm/templates/workflow_guide.html @ 159:83970c19b495

switched ssh repo url to user@example.com/path/ro/repo
author Arne Babenhauserheide <bab@draketo.de>
date Tue, 12 May 2009 11:09:24 +0200
parents 60678b7a5eb0
children bb60a4d6a1e3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
1 {% extends "base.html" %}
97
991719e0dbf5 Begun a workflow text.
Arne Babenhauserheide <bab@draketo.de>
parents:
diff changeset
2
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
3 {% load extras %}
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
4 {% block content %}
97
991719e0dbf5 Begun a workflow text.
Arne Babenhauserheide <bab@draketo.de>
parents:
diff changeset
5
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
6 <div class="row">
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
7 <div class="col big">
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
8
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
9
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
10 <h1>Learning Mercurial in Workflows</h1>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
11
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
12 <p>With Mercurial you can use a multitude of different workflows. This page shows some of them, including their use cases. It is intended to make it easy for Beginners of Version tracking to get going instantly and learn completely incrementally. It doesn't explain the concepts used, because there are already many other great resources doing that, for example <a title="Understanding Mercurial" href="http://www.selenic.com/mercurial/wiki/UnderstandingMercurial">the wiki</a> and <a title="Behind the Scenes" href="http://hgbook.red-bean.com/read/behind-the-scenes.html">the hgbook</a>.</p>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
13
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
14 <p>If you want a more exhaustive tutorial with the basics, please have a look at the <a title="Mercurial Tutorial" href="http://www.selenic.com/mercurial/wiki/Tutorial">Tutorial in the Mercurial Wiki</a>. For a really detailed and very nice to read description of Mercurial, please have a look at <a title="Mercurial: The definitive Guide" href="http://hgbook.red-bean.com/">Mercurial: The definitive Guide</a>.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
15
158
60678b7a5eb0 polishing
Arne Babenhauserheide <bab@draketo.de>
parents: 157
diff changeset
16 <p>Note: This guide doesn't require any prior knowledge of version control systems (though subversion users will likely feel at home quite quickly). Basic commandline abilities are helpful, because we'll use the commandline client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr --></p>
157
1a294e9be015 learning in workflows: Added note: no vcs skill required, but commandline skills are useful.
Arne Babenhauserheide <bab@draketo.de>
parents: 156
diff changeset
17
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
18 <h2>Basic workflows</h2>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
19
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
20 <h3>Log keeping</h3>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
21
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
22 <h4>Use Case</h4>
101
7bcdd8b947fe workflows: small fixes.
Arne Babenhauserheide <bab@draketo.de>
parents: 100
diff changeset
23
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
24 <p>The first workflow is also the easiest one: You want to use Mercurial to be able to look back when you did which changes.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
25
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
26 <p>This workflow only requires an installed Mercurial and write access to some file storage (you almost definitely have that :) ). It shows the basic techniques for more complex workflows.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
27
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
28 <h4>Workflow</h4>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
29
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
30 <h5>Prepare MercuriaL</h5>
129
177b4120c26b learning in workflows: Added info how to set the username.
Arne Babenhauserheide <bab@draketo.de>
parents: 128
diff changeset
31
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
32 <p>As first step, you should teach Mercurial your name. For that you open the file ~/.hgrc with a text-editor and add the ui section (user interaction) with your username:</p>
129
177b4120c26b learning in workflows: Added info how to set the username.
Arne Babenhauserheide <bab@draketo.de>
parents: 128
diff changeset
33
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
34 <pre>[ui]
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
35 username = Mr. Johnson <johnson@smith.com></pre>
129
177b4120c26b learning in workflows: Added info how to set the username.
Arne Babenhauserheide <bab@draketo.de>
parents: 128
diff changeset
36
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
37 <h5>Initialize the project</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
38
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
39 <pre>$ hg init project</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
40
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
41 <h5>Add files and track them</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
42
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
43 <pre>$ cd project
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
44 $ (add files)
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
45 $ hg add </pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
46
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
47 <p>Note: You can also go into an existing directory with files and init the repository there. </p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
48
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
49 <pre>$ cd project
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
50 $ hg init</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
51
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
52 <p>Alternatively you can add only specific files instead of all files in the directory. Mercurial will then track only these files and won't know about the others. The following tells mercurial to track all files whose names begin with "file0" as well as file10, file11 and file12.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
53
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
54 <pre>$ hg add file0* file10 file11 file12</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
55
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
56 <h5>Save changes</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
57
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
58 <pre>$ (do some changes)</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
59
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
60 <p>see which files changed, which have been added or removed, and which aren't tracked yet</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
61
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
62 <pre>$ hg status</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
63
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
64 <p>see the exact changes</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
65
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
66 <pre>$ hg diff</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
67
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
68 commit the changes.
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
69
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
70 <pre>$ hg commit</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
71
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
72 <p>now an editor pops up and asks you for a commit message. Upon saving and closing the editor, your changes have been stored by Mercurial.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
73
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
74 <p>Note: You can also supply the commit message directly via <hg>hg commit -m 'MESSAGE'</hg>.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
75
150
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
76 <h5>Move and copy files</h5>
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
77
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
78 <p>When you copy or move files, you should tell Mercurial to do the copy or move for you, so it can track the relationship between the files.</p>
150
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
79
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
80 <p>Remember to <hg>commit</hg> after moving or copying. From the basic commands only <hg>commit</hg> creates a new revision</p>
150
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
81
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
82 <pre>$ hg cp original copy
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
83 $ hg commit
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
84 (enter the commit message)
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
85 $ hg mv original target
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
86 $ hg commit
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
87 (enter the commit message)</pre>
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
88
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
89 <p>Now you have two files, "copy" and "target", and Mercurial knows how they are related.</p>
150
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
90
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
91 <p>Note: Should you forget to do the explicit copy or move, you can still tell Mercurial to detect the changes via <hg>hg addremove --similarity 100</hg>. Just use <hg>hg help addremove</hg> for details.</p>
150
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
92
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
93 <h5>Check your history</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
94
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
95 <pre>$ hg log</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
96
130
77b10482cc47 learning in workflows: How to see a specific patch.
Arne Babenhauserheide <bab@draketo.de>
parents: 129
diff changeset
97 This prints a list of changesets along with their date, the user who committed them (you) and their commit message.
77b10482cc47 learning in workflows: How to see a specific patch.
Arne Babenhauserheide <bab@draketo.de>
parents: 129
diff changeset
98
151
60be1cc49ae7 Learning in workflows: Added info about 'hg log -r REV'.
Arne Babenhauserheide <bab@draketo.de>
parents: 150
diff changeset
99 To see a certain revision, you can use the <hg>-r</hg> switch (--revision). To also see the diff of the displayed revisions, there's the <hg>-p</hg> switch (--patch)
130
77b10482cc47 learning in workflows: How to see a specific patch.
Arne Babenhauserheide <bab@draketo.de>
parents: 129
diff changeset
100
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
101 <pre>$ hg log -p -r 3</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
102
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
103 <h3>Lone developer with linear history</h3>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
104
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
105 <h4>Use case</h4>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
106
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
107 <p>The second workflow is still very easy: You're a lone developer and you want to use Mercurial to keep track of your own changes.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
108
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
109 <p>It works just like the log keeping workflow, with the difference that you go back to earlied changes at times.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
110
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
111 <p>To start a new project, you initialize a repository, add your files and commit whenever you finished a part of your work.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
112
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
113 <p>Also you check your history from time to time, so see how you progressed.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
114
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
115 <h4>Workflow</h4>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
116
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
117 <h5>Basics from log keeping</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
118
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
119 <p>Init your project, add files, see changes and commit them.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
120
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
121 <pre>$ hg init project
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
122 $ cd project
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
123 $ (add files)
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
124 $ hg add # tell Mercurial to track all files
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
125 $ (do some changes)
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
126 $ hg diff # see changes
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
127 $ hg commit # save changes
152
1a01a60eeaf5 learning in workflows: Added mv and cp to the repeated basics in the Lone Dev workflow.
Arne Babenhauserheide <bab@draketo.de>
parents: 151
diff changeset
128 $ hg cp # copy files or folders
1a01a60eeaf5 learning in workflows: Added mv and cp to the repeated basics in the Lone Dev workflow.
Arne Babenhauserheide <bab@draketo.de>
parents: 151
diff changeset
129 $ hg mv # move files or folders
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
130 $ hg log # see history</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
131
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
132 <h5>Seeing an earlier revision</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
133
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
134 <p>Different from the log keeping workflow, you'll want to go back in history at times and do some changes directly there, for example because an earlier change introduced a bug and you want to fix it where it occurred.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
135
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
136 <p>To look at a previous version of your code, you can use update. Let's assume that you want to see revision 3.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
137
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
138 <pre>$ hg update 3</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
139
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
140 <p>Now your code is back at revision 3, the fourth commit (Mercurial starts counting at 0).
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
141 To check if you're really at that revision, you can use <hg>identify -n</hg>.</p>
136
0364cfc00295 learning in workflows: Added identify and update to 'null'
Arne Babenhauserheide <bab@draketo.de>
parents: 135
diff changeset
142
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
143 <pre>$ hg identify -n</pre>
136
0364cfc00295 learning in workflows: Added identify and update to 'null'
Arne Babenhauserheide <bab@draketo.de>
parents: 135
diff changeset
144
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
145 <p>Note: <hg>identify</hg> without options gives you the short form of a unique revision ID. That ID is what Mercurial uses internally. If you tell someone about the version you updated to, you should use that ID, since the numbers can be different for other people. If you want to know the reasons behind that, please read up Mercurials [basic concepts](). When you're at the most recent revision, <hg>hg identify -n</hg> will return "-1".</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
146
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
147 <p>To update to the most recent revision, you can use "tip" as revision name.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
148
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
149 <pre>$ hg update tip</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
150
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
151 <p>Note: If at any place any command complains, your best bet is to read what it tells you and follow that advice.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
152
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
153 <p>Note: Instead of <hg>hg update</hg> you can also use the shorthand <hg>hg up</hg>. Similarly you can abbreviate <hg>hg commit</hg> to <hg>hg ci</hg>.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
154
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
155 <p>Note: To get a revision devoid of files, just <hg>update</hg> to "null" via <hg>hg update null</hg>. That's the revision before any files were added.</p>
136
0364cfc00295 learning in workflows: Added identify and update to 'null'
Arne Babenhauserheide <bab@draketo.de>
parents: 135
diff changeset
156
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
157 <h5>Fixing errors in earlier revisions</h5>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
158
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
159 <p>When you find a bug in some earlier revision you have two options: either you can fix it in the current code, or you can go back in history and fix the code exactly where you did it, which creates a cleaner history.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
160
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
161 <p>To do it the cleaner way, you first update to the old revision, fix the bug and commit it. Afterwards you merge this revision and commit the merge. Don't worry, though: Merging in mercurial is fast and painless, as you'll see in an instant.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
162
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
163 <p>Let's assume the bug was introduced in revision 3.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
164
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
165 <pre>$ hg update 3
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
166 $ (fix the bug)
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
167 $ hg commit</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
168
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
169 <p>Now the fix is already stored in history. We just need to merge it with the current version of your code.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
170
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
171 <pre>$ hg merge</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
172
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
173 <p>If there are conflicts use <hg>hg resolve</hg> - that's also what merge tells you to do in case of conflicts.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
174
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
175 <p>First list the files with conflicts</p>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
176
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
177 <pre>$ hg resolve --list</pre>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
178
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
179 <p>Then resolve them one by one. <hg>resolve</hg> attempts the merge again</p>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
180
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
181 <pre>$ hg resolve conflicting_file
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
182 (fix it by hand, if necessary)</pre>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
183
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
184 <p>Mark the fixed file as resolved</p>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
185
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
186 <pre>$ hg resolve --mark conflicting_file</pre>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
187
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
188 <p>Commit the merge, as soon as you resolved all conflicts. This step is also necessary when there were no conflicts!</p>
133
5e1cff189630 learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
Arne Babenhauserheide <bab@draketo.de>
parents: 132
diff changeset
189
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
190 <pre>$ hg commit</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
191
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
192 <p>At this point, your fix is merged with all your other work, and you can just go on coding. Additionally the history shows clearly where you fixed the bug, so you'll always be able to check where the bug was.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
193
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
194 <p>Note: Most merges will just work. You only need <hg>resolve</hg>, when <hg>merge</hg> complains.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
195
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
196 <p>So now you can initialize repositories, save changes, update to previous changes and develop in a nonlinear history by committing in earlier changesets and merging the changes into the current code.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
197
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
198 <p>Note: If you fix a bug in an earlier revision, and some later revision copied or moved that file, the fix will be propagated to the target file(s) when you merge. This is the main reason why you should always use <hg>hg cp</hg> and <hg>hg mv</hg>.</p>
150
6d5a62a9821e learning in workflows: Added section on explicit file copy and move.
Arne Babenhauserheide <bab@draketo.de>
parents: 149
diff changeset
199
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
200 <h3>Seperate features</h3>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
201
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
202 <h4>Use Case</h4>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
203
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
204 <p>At times you'll be working on several features in parallel. If you want to avoid mixing incomplete code versions, you can create clones of your local repository and work on each feature in its own code directory.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
205
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
206 <p>After finishing your feature you then <hg>pull</hg> it back into your main directory and <hg>merge</hg> the changes.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
207
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
208 <h4>Workflow</h4>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
209
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
210 <p>First create the feature clone and do some changes</p>
132
a7fb926c69f6 learning in workflows: fixed soem typos and did some clarifications.
Arne Babenhauserheide <bab@draketo.de>
parents: 131
diff changeset
211
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
212 <pre>$ hg clone project feature1
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
213 $ cd feature1
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
214 $ (do some changes and commits)</pre>
131
59b5985db58a learning in workflows: added 'incoming'
Arne Babenhauserheide <bab@draketo.de>
parents: 130
diff changeset
215
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
216 <p>Now check what will come in when you <hg>pull</hg> from feature1, just like you can use <hg>diff</hg> before committing. The respective command for pulling is <hg>incoming</hg></p>
131
59b5985db58a learning in workflows: added 'incoming'
Arne Babenhauserheide <bab@draketo.de>
parents: 130
diff changeset
217
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
218 <pre>$ cd ../project
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
219 $ hg incoming ../feature1</pre>
131
59b5985db58a learning in workflows: added 'incoming'
Arne Babenhauserheide <bab@draketo.de>
parents: 130
diff changeset
220
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
221 <p>Note: If you want to see the diffs, you can use <hg>hg incoming --patch</hg> just as you can do with <hg>hg log --patch</hg> for the changes in the repository.</p>
131
59b5985db58a learning in workflows: added 'incoming'
Arne Babenhauserheide <bab@draketo.de>
parents: 130
diff changeset
222
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
223 <p>If you like the changes, you pull them into the project</p>
131
59b5985db58a learning in workflows: added 'incoming'
Arne Babenhauserheide <bab@draketo.de>
parents: 130
diff changeset
224
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
225 <pre>$ hg pull ../feature1</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
226
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
227 <p>Now you have the history of feature1 inside your project, but the changes aren't yet visible. Instead they are only stored inside a ".hg" directory of the project (<a title="Behind the Scenes" href="http://hgbook.red-bean.com/read/behind-the-scenes.html">more information on the store</a>).</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
228
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
229 <p>Note: From now on we'll use the name "repository" for a directory which has a .hg directory with Mercurial history.</p>
101
7bcdd8b947fe workflows: small fixes.
Arne Babenhauserheide <bab@draketo.de>
parents: 100
diff changeset
230
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
231 <p>If you didn't do any changes in the project, while you were working on feature1, you can just update to tip (<hg>hg update tip</hg>), but it is more likely that you'll have done some other changes in between changes. In that case, it's time for merging.</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
232
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
233 <p>Merge feature1 into the project code</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
234
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
235 <pre>$ hg merge</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
236
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
237 <p>If there are conflicts use <hg>hg resolve</hg> - that's also what merge tells you to do in case of conflicts. After you <hg>merge</hg>, you have to <hg>commit</hg> explicitely to make your <hg>merge</hg> final</p>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
238
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
239 <pre>$ hg commit
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
240 (enter commit message, for example "merged feature1")</pre>
99
71ff3b94b20d Added workflows sysadmin, lone developer and seperate features.
Arne Babenhauserheide <bab@draketo.de>
parents: 97
diff changeset
241
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
242 <p>You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your files at home and at work, or between your desktop and your laptop.</p>
132
a7fb926c69f6 learning in workflows: fixed soem typos and did some clarifications.
Arne Babenhauserheide <bab@draketo.de>
parents: 131
diff changeset
243
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
244 <p>Note: You also have to commit after a merge when there are no conflicts, because merging creates new history and you might want to attach a specific message to the merge (like "merge feature1").</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
245
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
246 <h3>Sharing changes</h3>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
247
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
248 <h4>Use Case</h4>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
249
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
250 <p>Now we go one step further: You are no longer alone, and you want to share your changes with others and include their changes.</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
251
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
252 <p>The basic requirement for that is that you have to be able to see the changes of others.</p>
104
03591004ed44 workflows: Added plan for sharing via email and via shared repo (bitbucket).
Arne Babenhauserheide <bab@draketo.de>
parents: 103
diff changeset
253
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
254 <p>Mercurial allows you to do that very easily by including a simple webserver from which you can <hg>pull</hg> changes just as you can pull changes from local clones.</p>
104
03591004ed44 workflows: Added plan for sharing via email and via shared repo (bitbucket).
Arne Babenhauserheide <bab@draketo.de>
parents: 103
diff changeset
255
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
256 <p>Note: There are a few other ways to share changes, though. Instead of using the builtin webserver, you can also send the changes by email or setup a shared repository, to where you <hg>push</hg> changes instead of pulling them. We'll cover one of those later.</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
257
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
258 <h4>Workflow</h4>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
259
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
260 <h5>Using the builtin webserver</h5>
104
03591004ed44 workflows: Added plan for sharing via email and via shared repo (bitbucket).
Arne Babenhauserheide <bab@draketo.de>
parents: 103
diff changeset
261
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
262 <p>This is the easiest way to quickly share changes.</p>
104
03591004ed44 workflows: Added plan for sharing via email and via shared repo (bitbucket).
Arne Babenhauserheide <bab@draketo.de>
parents: 103
diff changeset
263
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
264 <p>First the one who wants to share his changes creates the webserver</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
265
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
266 <pre>$ hg serve</pre>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
267
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
268 <p>Now all others can point their browsers to his IP address (for example 192.168.178.100) at port 8000. They will then see all his history there and can sdecide if they want to pull his changes.</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
269
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
270 <pre>$ firefox http://192.168.178.100:8000</pre>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
271
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
272 <p>If they decide to include the changes, they just pull from the same URL</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
273
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
274 <pre>$ hg pull http://192.168.178.100:8000</pre>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
275
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
276 <p>At this point you all can work as if you had pulled from a local repository. All the data is now in your individual repositories and you can merge the changes and work with them without needing any connection to the served repository.</p>
100
6e29cdea7b3a Workflows: Added basic sharing of changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 99
diff changeset
277
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
278 <h5>Sending changes by email</h5>
104
03591004ed44 workflows: Added plan for sharing via email and via shared repo (bitbucket).
Arne Babenhauserheide <bab@draketo.de>
parents: 103
diff changeset
279
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
280 <p>Often you won't have direct access to the repository of someone else, be it because he's behind a restrictive firewall, or because you live in different timezones. You might also want to keep your changes confidential and prefer internal email (if you want additional protection, you can also encrypt the emails, for example with <a href="http://gnupg.org" title="GnuPG">GnuPG</a>).</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
281
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
282 <p>In that case, you can easily export your changes as patches and send them by email.</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
283
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
284 <p>Another reason to send them by email can be that your policy requires manual review of the changes when the other developers are used to reading diffs in emails. I'm sure you can think of more reasons.</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
285
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
286 <p>Sending the changes via email is pretty straightforward with Mercurial. You just <hg>export</hg> your changes and attach (or copy paste) it in your email. Your collegues can then just <hg>import</hg> them.</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
287
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
288 <p>First check which changes you want to export</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
289
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
290 <pre>$ cd project
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
291 $ hg log</pre>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
292
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
293 <p>We assume that you want to export changeset 3 and 4</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
294
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
295 <pre>$ hg export 3 > change3.diff
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
296 $ hg export 4 > change4.diff</pre>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
297
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
298 <p>Now attach them to an email and your collegues can just run <hg>import</hg> on both diffs to get your full changes, including your user information.</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
299
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
300 <p>To be careful, they first <hg>clone</hg> their repository to have an integration directory as sandbox</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
301
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
302 <pre>$ hg clone project integration
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
303 $ cd integration
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
304 $ hg import change3.diff
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
305 $ hg import change4.diff</pre>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
306
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
307 <p>That's it. They can now test your changes in feature clones. If they accept them, they <hg>pull</hg> the changes into the main repository</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
308
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
309 <pre>$ cd ../project
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
310 $ hg pull ../integration</pre>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
311
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
312 <p>Note: The <em>patchbomb</em> extension automates the email-sending, but you don't need it for this workflow.</p>
108
ed683ad3947f learning in workflows: Send changes by email.
Arne Babenhauserheide <bab@draketo.de>
parents: 107
diff changeset
313
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
314 <p>Note 2: You can also send around bundles, which are snippets of your actual history. Just create them via </p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
315 <pre>$ hg bundle --base FIRST_REVISION_TO_BUNDLE changes.bundle</pre>
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
316 <p>Others can then get your changes by simply pulling them, as if your bundle were an actual repository</p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
317 <pre>$ hg pull path/to/changes.bundle</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
318
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
319 <h5>Using a shared repository</h5>
104
03591004ed44 workflows: Added plan for sharing via email and via shared repo (bitbucket).
Arne Babenhauserheide <bab@draketo.de>
parents: 103
diff changeset
320
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
321 <p>Sending changes by email might be the easiest way to reach people when you aren't yet part of the regular development team, but it creates additional workload: You have to <hg>bundle</hg> the changes, send mails and then <hg>import</hg> the bundles manually. Luckily there's an easier way which works quite well: The shared push repository.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
322
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
323 <p>Till now we transferred all changes either via email or via <hg>pull</hg>. Now we use another otion: pushing. As the name suggests it's just the opposite of pulling: You <hg>push</hg> your changes into another repository.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
324
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
325 <p>But to make use of it, we first need something we can push to.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
326
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
327 <p>By default <hg>hg serve</hg> doesn't allow pushing, since that would be a major security hole. You can allow pushing in the server, but that's no solution when you live in different timezones, so we'll go with another approach here: Using a shared repository, either on an existing shared server or on a service like <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. Doing so has a bit higher starting cost and takes a bit longer to explain, but it's well worth the effort spent.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
328
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
329 <p>If you want to use an existing shared server, you can use <hg>serve</hg> there and <a title="How to allow pushing for hg serve" href="http://www.selenic.com/mercurial/wiki/HgWebDirStepByStep#head-746ca383e3a62df34279ec2fca888113497da022">allow pushing</a>. Also there are some other nice ways to <a title="Multiple Committers" href="http://www.selenic.com/mercurial/wiki/MultipleCommitters">allow pushing to a Mercurial repository</a>, including simple <a title="Setting up a shared Mercurial repository using SSH" href="http://www.selenic.com/mercurial/wiki/SharedSSH">access via SSH</a>.</p>
135
8d069bba8cce learning in workflows: shared server now contains a bit more information for people with existing servers.
Arne Babenhauserheide <bab@draketo.de>
parents: 134
diff changeset
330
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
331 <p>Otherwise you first need to setup a BitBucket Account. Just signup at <a title="BitBucket" href="http://bitbucket.org">BitBucket</a>. After signing up (and login) hover your mouse over "Repositories". There click the item at the bottom of the opening dialog which say "Create new".</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
332
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
333 <p>Give it a name and a description. If you want to keep it hidden from the public, select "private"</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
334
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
335 <pre>$ firefox http://bitbucket.org</pre>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
336
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
337 <p>Now your repository is created and you see instructions for <hg>push</hg>ing to it. for that you'll use a command similar to the following (just with a different URL)</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
338
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
339 <pre>$ hg push https://bitbucket.org/ArneBab/hello/</pre>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
340
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
341 <p>(Replace the URL with the URL of your created repository. If your username is "Foo" and your repository is named "bar", the URL will be https://bitbucket.org/Foo/bar/)</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
342
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
343 <p>Mercurial will ask for your BitBucket password, then <hg>push</hg> your code.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
344
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
345 <p>Voilà, your code is online.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
346
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
347 <p>Note: You can also <a title="use SSH for pushing to BitBucket" href="http://bitbucket.org/help/UsingSSH">use SSH for pushing to BitBucket</a>.</p>
135
8d069bba8cce learning in workflows: shared server now contains a bit more information for people with existing servers.
Arne Babenhauserheide <bab@draketo.de>
parents: 134
diff changeset
348
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
349 <p>Now it's time to tell all your collegues to sign up at BitBucket, too.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
350
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
351 <p>After that you can click the "Admin" tab of your created repository and add the usernames of your collegues on the right side under "Permission: Writers". Now they are allowed to <hg>push</hg> code to the repository.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
352
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
353 <p>(If you chose to make the repository private, you'll need to add them to "Permission: Readers", too)</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
354
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
355 <p>If one of you now wants to publish changes, he'll simply <hg>push</hg> them to the repository, and all others get them by <hg>pull</hg>ing.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
356
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
357 <p>Publish your changes</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
358
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
359 <pre>$ hg push https://bitbucket.org/ArneBab/hello/</pre>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
360
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
361 <p>Pull others changes into your local repository</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
362
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
363 <pre>$ hg pull https://bitbucket.org/ArneBab/hello/</pre>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
364
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
365 <p>People who join you in development can also just <hg>clone</hg> this repository, as if one of you were using <hg>hg serve</hg></p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
366
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
367 <pre>$ hg clone https://bitbucket.org/ArneBab/hello/ hello</pre>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
368
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
369 <p>That local repository will automatically be configured to pull/push from/to the online repository, so new contributors can just use <hg>hg push</hg> and <hg>hg pull</hg> without an URL.</p>
110
8c8c8aaaaad7 learning in workflows: added sharing changes.
Arne Babenhauserheide <bab@draketo.de>
parents: 108
diff changeset
370
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
371 <p>Note: To make this workflow more scaleable, each one of you can have his own BitBucket repository and you can simply <hg>pull</hg> from the others repositories. That way you can easily establish workflows in which certain people act as integrators and finally <hg>push</hg> checked code to a shared pull repository from which all others pull.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
372
159
83970c19b495 switched ssh repo url to user@example.com/path/ro/repo
Arne Babenhauserheide <bab@draketo.de>
parents: 158
diff changeset
373 <p>Note: You can also use this workflow with a shared server instead of BitBucket, either via SSH or via a shared directory. An example for an SSH URL with Mercurial is be ssh://user@example.com/path/to/repo. When using a shared directory you just push as if the repository in the shared directory were on your local drive.</p>
141
cf102ae37ad9 Added a note about using shared servers instead of bitbucket.org
Arne Babenhauserheide <bab@draketo.de>
parents: 140
diff changeset
374
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
375 <h3>Summary</h3>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
376
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
377 <p>Now let's take a step back and look where we are.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
378
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
379 <p>With the commands you already know, a bit reading of <hg>hg help &lt;command&gt;</hg> and some evil script-fu you can already do almost everything you'll ever need to do when working with source code history. So from now on almost everything is convenience, and that's a good thing.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
380
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
381 <p>First this is good, because it means, that you can now use most of the concepts which are utilized in more complex workflows.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
382
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
383 <p>Second it aids you, because convenience lets you focus on your task instead of focussing on your tool. It helps you concentrate on the coding itself. Still you can always go back to the basics, if you want to.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
384
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
385 <p>A short summary of what you can do which can also act as a short check, if you still remember the meaning of the commands.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
386
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
387 <h4>create a project</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
388
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
389 <pre>$ hg init project
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
390 $ cd project
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
391 $ (add some files)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
392 $ hg add
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
393 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
394 (enter the commit message)</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
395
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
396 <h4>do nonlinear development</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
397
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
398 <pre>$ (do some changes)
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
399 $ hg commit
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
400 (enter the commit message)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
401 $ hg update 0
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
402 $ (do some changes)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
403 $ hg commit
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
404 (enter the commit message)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
405 $ hg merge
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
406 $ (optionally hg resolve)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
407 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
408 (enter the commit message)</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
409
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
410 <h4>use feature clones</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
411
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
412 <pre>$ cd ..
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
413 $ hg clone project feature1
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
414 $ cd feature1
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
415 $ (do some changes)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
416 $ hg commit
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
417 (enter the commit message)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
418 $ cd ../project
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
419 $ hg pull ../feature1</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
420
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
421 <h4>share your repository via the integrated webserver</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
422
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
423 <pre>$ hg serve &amp;
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
424 $ cd ..
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
425 $ hg clone http://127.0.0.1:8000 project-clone</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
426
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
427 <h4>export changes to files</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
428
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
429 <pre>$ cd project-clone
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
430 $ (do some changes)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
431 $ hg commit
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
432 (enter the commit message)
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
433 $ hg export tip > ../changes.diff</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
434
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
435 <h4>import changes from files</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
436
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
437 <pre>$ cd ../project
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
438 $ hg import ../changes.diff</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
439
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
440 <h4>pull changes from a served repository (hg serve still runs on project)</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
441
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
442 <pre>$ cd ../feature1
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
443 $ hg pull http://127.0.0.1:8000</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
444
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
445 <h4>Use shared repositories on BitBucket</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
446
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
447 <pre>$ (setup bitbucket repo)
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
448 $ hg push https://bitbucket.org/USER/REPO
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
449 (enter name and password in the prompt)
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
450 $ hg pull https://bitbucket.org/USER/REPO</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
451
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
452
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
453 <p>Let's move on towards useful features and a bit more advanced workflows.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
454
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
455 <h3>Backing out bad revisions</h3>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
456
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
457 <h4>Use Case</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
458
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
459 <p>When you routinely pull code from others, it can happen that you overlook some bad change. As soon as others pull that change from you, you have little chance to get completely rid of it.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
460
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
461 <p>To resolve that problem, Mercurial offers you the <hg>backout</hg> command. Backing out a change means, that you tell Mercurial to create a commit which reverses the bad change. That way you don't get rid of the bad code in history, but you can remove it from new revisions.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
462
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
463 <p>Note: The basic commands don't directly rewrite history. If you want to do that, you need to activate some of the extensions which are shipped with mercurial. We'll come to that later on.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
464
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
465 <h4>Workflow</h4>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
466
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
467 <p>Let's assume the bad change was revision 3, and we already have one more revision in our repository. To remove the bad code, we just <hg>backout</hg> of it. This creates a new change which reverses the bad change. After backing out, we merge that new change into the current code.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
468
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
469 <pre>$ hg backout 3
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
470 $ hg merge
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
471 (potentially resolve conflicts)
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
472 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
473 (enter commit message. For example: "merged backout")</pre>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
474
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
475 <p>That's it. You reversed the bad change. It's still recorded that it was once there (following the principle "don't rewrite history, if it's not really necessary"), but it doesn't affect future code anymore.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
476
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
477 <h3>Collaborative feature development</h3>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
478
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
479 <p>Now that you can share changes and reverse them if necessary, you can go one step further: Using Mercurial to help in coordinating the coding.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
480
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
481 <p>The first part is an easy way to develop features together, without requiring every developer to keep track of several feature clones.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
482
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
483 <h4>Use Case</h4>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
484
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
485 <p>When you want to split your development into several features, you need to keep track of who works on which feature and where to get which changes.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
486
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
487 <p>Mercurial makes this easy for you by providing named branches. They are a part of the main repository, so they are available to everyone involved. At the same time, changes committed on a certain branch don't get mixed with the changes in the default branch, so features are kept separate, until they get merged into the default branch.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
488
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
489 <p>Note: Cloning a repository always puts you onto the default branch at first.</p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
490
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
491 <h4>Workflow</h4>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
492
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
493 <p>When someone in your group wants to start coding on a feature without disturbing the others, he can create a named branch and commit there. When someone else wants to join in, he just updates to the branch and commits away. As soon as the feature is finished, someone merges the named branch into the default branch.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
494
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
495 <h5>Working in a named branch</h5>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
496
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
497 <p>Create the branch</p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
498
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
499 <pre>$ hg branch feature1
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
500 (do some changes)
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
501 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
502 (write commit message)</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
503
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
504 <p>Update into the branch and work in it</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
505
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
506 <pre>$ hg update feature1
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
507 (do some changes)
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
508 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
509 (write commit message)</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
510
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
511 <p>Now you can <hg>commit</hg>, <hg>pull</hg>, <hg>push</hg> and <hg>merge</hg> (and anything else) as if you were working in a separate repository. If the history of the named branch is linear and you call "hg merge", Mercurial asks you to specify an explicit revision, since the branch in which you work doesn't have anything to merge.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
512
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
513 <h5>Merge the named branch</h5>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
514
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
515 <p>When you finished the feature, you <hg>merge</hg> the branch back into the default branch.</p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
516
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
517 <pre>$ hg update default
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
518 $ hg merge feature1
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
519 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
520 (write commit message)</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
521
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
522 <p>And that's it. Now you can easily keep features separate without unnecessary bookkeeping.</p>
132
a7fb926c69f6 learning in workflows: fixed soem typos and did some clarifications.
Arne Babenhauserheide <bab@draketo.de>
parents: 131
diff changeset
523
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
524 <p>Note: Named branches stay in history as permanent record after you finished your work. If you don't like having that record in your history, please have a look at some of the advanced <a title="Mercurial Workflows" href="http://www.selenic.com/mercurial/wiki/Workflows">workflows</a>.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
525
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
526 <h3>Tagging revisions</h3>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
527
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
528 <h4>Use Case</h4>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
529
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
530 <p>Since you can now code separate features more easily, you might want to mark certain revisions as fit for consumption (or similar). For example you might want to mark releases, or just mark off revisions as reviewed.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
531
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
532 <p>For this Mercurial offers tags. Tags add a name to a revision and are part of the history. You can tag a change years after it was committed. The tag includes the information when it was added, and tags can be pulled, pushed and merged just like any other committed change.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
533
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
534 <p>Note: A tag must not contain the char ":", since that char is used for specifying multiple reivions - see "hg help revisions".</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
535
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
536 <p>Note: To securely mark a revision, you can use the <a title="Using GnuPG to securely sign revisions in Mercurial" href="http://www.selenic.com/mercurial/wiki/GpgExtension">gpg extension</a> to sign the tag.</p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
537
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
538 <h4>Workflow</h4>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
539
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
540 <p>Let's assume you want to give revision 3 the name "v0.1".</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
541
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
542 <p>Add the tag</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
543
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
544 <pre>$ hg tag -r 3 v0.1</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
545
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
546 <p>See all tags</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
547
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
548 <pre>$ hg tags</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
549
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
550 <p>When you look at the log you'll now see a line in changeset 3 which marks the Tag. If someone wants to <hg>update</hg> to the tagged revision, he can just use the name of your tag</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
551
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
552 <pre>$ hg update v0.1</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
553
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
554 <p>Now he'll be at the tagged revision and can work from there.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
555
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
556
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
557 <h3>Removing history</h3>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
558
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
559 <h4>Use Case</h4>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
560
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
561 <p>At times you will have changes in your repository, which you really don't want in it.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
562
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
563 <p>There are many advanced options for removing these, and most of them use great extensions (<a title="Mercurial Queues Extension" href="http://www.selenic.com/mercurial/wiki/MqExtension">Mercurial Queues</a> is the most often used one), but in this basic guide, we'll solve the problem with just the commands we already learned. But we'll use an option to clone which we didn't yet use.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
564
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
565 <p>This workflow becomes inconvenient when you need to remove changes, which are buried below many new changes. If you spot the bad changes early enough, you can get rid of them without too much effort, though.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
566
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
567 <h4>Workflow</h4>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
568
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
569 <p>Let's assume you want to get rid of revision 2 and the highest revision is 3.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
570
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
571 <p>The first step is to use the "--rev" option to <hg>clone</hg>: Create a clone which only contains the changes up to the specified revision. Since you want to keep revision 1, you only clone up to that</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
572
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
573 <pre>$ hg clone -r 1 project stripped</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
574
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
575 <p>Now you can <hg>export</hg> the change 3 from the original repository (project) and <hg>import</hg> it into the stripped one</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
576
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
577 <pre>$ cd project
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
578 $ hg export 3 > ../changes.diff
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
579 $ cd ../stripped
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
580 $ hg import ../changes.diff</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
581
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
582 <p>If a part of the changes couldn't be applied, you'll see that part in *.rej files. If you have *.rej files, you'll have to include or discard changes by hand</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
583
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
584 <pre>$ cat *.rej
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
585 (apply changes by hand)
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
586 $ hg commit
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
587 (write commit message)</pre>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
588
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
589 <p>That's it. <hg>hg export</hg> also includes the commit message, date, committer and similar metadata, so you are already done.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
590
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
591 <p>Note: removing history will change the revision IDs of revisions after the removed one, and if you pull from someone else who still has the revision you removed, you will pull the removed parts again. That's why rewriting history should most times only be done for changes which you didn't yet publicise.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
592
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
593 <h3>Summary</h3>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
594
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
595 <p>So now you can work with Mercurial in private, and also share your changes in a multitude of ways.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
596
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
597 <p>Additionally you can also remove bad changes, either by creating a change in the repository which reverses the original change, or by really rewriting history, so it looks like the change never occured.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
598
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
599 <p>And you can separate the work on features in a single repository by using named branches and add tags to revisions which are visible markers for others and can be used to update to the tagged revisions.</p>
124
0bee8982f334 learning in workflows mostly finished - I hope :) .
Arne Babenhauserheide <bab@draketo.de>
parents: 115
diff changeset
600
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
601 <p>With this we can conclude our practical guide.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
602
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
603 <h2>More Complex Workflows</h2>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
604
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
605 <p>If you now want to check some more complex workflows, please have a look at the general <a title="Mercurial Workflows" href="http://selenic.com/mercurial/wiki/Workflows">workflows wikipage</a>.</p>
139
2fcd14a3b9f9 learning in workflows: Added a link to the (not yet written) basic concept overview for understanding.
Arne Babenhauserheide <bab@draketo.de>
parents: 138
diff changeset
606
155
5451a67b896f learning in workflows: Manually added linebreaks (<p> tags) and took the chance to do some more polishing.
Arne Babenhauserheide <bab@draketo.de>
parents: 154
diff changeset
607 <p>To deepen your understanding, you should also check the <a title="Overview of the basic concepts of Mercurial" href="quick_start_concepts">basic concept overview</a>.</p>
111
8b51ceb2d36b learning in workflows: Added backout.
Arne Babenhauserheide <bab@draketo.de>
parents: 110
diff changeset
608
156
bc05b688ac06 minor fix: no italics fo final 'Have fun'.
Arne Babenhauserheide <bab@draketo.de>
parents: 155
diff changeset
609 <p>Have fun with Mercurial!</p>
143
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
610
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
611
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
612
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
613 <div class="col">
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
614 {% download_button %}
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
615 {% mercurial_tricks %}
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
616 </div>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
617 </div>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
618
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
619 </div>
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
620
fc5a9f3e5479 Converted the workflow guide into html, added links and polished it.
Arne Babenhauserheide <bab@draketo.de>
parents: 141
diff changeset
621 {% endblock %}