Mercurial > hg-website
comparison text/workflows.txt @ 100:6e29cdea7b3a
Workflows: Added basic sharing of changes.
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Wed, 22 Apr 2009 12:52:44 +0200 |
parents | 71ff3b94b20d |
children | 7bcdd8b947fe |
comparison
equal
deleted
inserted
replaced
99:71ff3b94b20d | 100:6e29cdea7b3a |
---|---|
171 | 171 |
172 $ hg commit -m "merged feature1" | 172 $ hg commit -m "merged feature1" |
173 | 173 |
174 You can create an arbitrary number of clones and also carry them around on USB sticks, so you an also synchronize your work at home and at work. | 174 You can create an arbitrary number of clones and also carry them around on USB sticks, so you an also synchronize your work at home and at work. |
175 | 175 |
176 == Sharing changes really easily == | |
177 | |
178 === Use Case === | |
179 | |
180 Now we go one step further: You are no longer alone, and you want to share your changes with others and include their changes. | |
181 | |
182 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. | |
183 | |
184 === Workflow === | |
185 | |
186 First the one who wants to share his changes creates the webserver | |
187 | |
188 $ hg serve | |
189 | |
190 Now all others can point their browsers to his IP address (i.e. 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. | |
191 | |
192 $ firefox http://192.168.178.100:8000 | |
193 | |
194 If they decide to include the changes, they just pull from the same URL | |
195 | |
196 $ hg pull http://192.168.178.100:8000 | |
197 | |
198 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. | |
199 |