diff 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
line wrap: on
line diff
--- a/text/workflows.txt	Wed Apr 22 12:56:39 2009 +0200
+++ b/text/workflows.txt	Wed Apr 22 13:10:11 2009 +0200
@@ -177,16 +177,24 @@
 
 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. 
 
-== Sharing changes really easily ==
+== Sharing changes ==
 
 === Use Case ===
 
 Now we go one step further: You are no longer alone, and you want to share your changes with others and include their changes. 
 
-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. 
+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. 
+
+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. 
 
 === Workflow ===
 
+==== Using the builtin webserver ====
+
+This is the easiest way to quickly share changes. 
+
 First the one who wants to share his changes creates the webserver
 
 $ hg serve
@@ -201,3 +209,8 @@
 
 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. 
 
+==== Sending changes by email ====
+
+==== Using a shared repository ====
+
+-> bitbucket