comparison text/workflows.txt @ 104:03591004ed44

workflows: Added plan for sharing via email and via shared repo (bitbucket).
author Arne Babenhauserheide <bab@draketo.de>
date Wed, 22 Apr 2009 13:10:11 +0200
parents 2bbea4b68181
children cdcc94ca41e7
comparison
equal deleted inserted replaced
103:2bbea4b68181 104:03591004ed44
175 175
176 $ hg commit -m "merged feature1" 176 $ hg commit -m "merged feature1"
177 177
178 You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your work at home and at work. 178 You can create an arbitrary number of clones and also carry them around on USB sticks. Also you can use them to synchronize your work at home and at work.
179 179
180 == Sharing changes really easily == 180 == Sharing changes ==
181 181
182 === Use Case === 182 === Use Case ===
183 183
184 Now we go one step further: You are no longer alone, and you want to share your changes with others and include their changes. 184 Now we go one step further: You are no longer alone, and you want to share your changes with others and include their changes.
185 185
186 The basic requirement for that is that you have to be able to see the changes of others. Mercurial allows you to do that very easily by including a simple webserver from which you can pull changes just as you can pull changes from local clones. 186 The basic requirement for that is that you have to be able to see the changes of others.
187 187
188 === Workflow === 188 Mercurial allows you to do that very easily by including a simple webserver from which you can pull changes just as you can pull changes from local clones.
189
190 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 "push" changes instead of pulling them.
191
192 === Workflow ===
193
194 ==== Using the builtin webserver ====
195
196 This is the easiest way to quickly share changes.
189 197
190 First the one who wants to share his changes creates the webserver 198 First the one who wants to share his changes creates the webserver
191 199
192 $ hg serve 200 $ hg serve
193 201
199 207
200 $ hg pull http://192.168.178.100:8000 208 $ hg pull http://192.168.178.100:8000
201 209
202 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. You can merge the changes and work with them without needing any connection to the served repository. 210 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. You can merge the changes and work with them without needing any connection to the served repository.
203 211
212 ==== Sending changes by email ====
213
214 ==== Using a shared repository ====
215
216 -> bitbucket