Mercurial > hg-website
changeset 101:7bcdd8b947fe
workflows: small fixes.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Wed, 22 Apr 2009 12:52:54 +0200 |
| parents | 6e29cdea7b3a |
| children | fa153f85e455 |
| files | text/workflows.txt |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/text/workflows.txt Wed Apr 22 12:52:44 2009 +0200 +++ b/text/workflows.txt Wed Apr 22 12:52:54 2009 +0200 @@ -24,6 +24,8 @@ == Sysadmin workflow == +=== Use Case === + The first workflow is also the easiest one: You're a sysadmin and you want to use Mercurial to be able to look back when you did which changes. This workflow only requires an installed Mercurial and write access to some file storage (you almost definitely have that :) ). It shows the basic technics for more complex workflows. @@ -161,6 +163,8 @@ Now you have the history of feature1 inside your project, but they aren't yet visible. Instead they are only stored inside the .hg directory inside the project. +From now on we'll use the name "repository" for a directory which has a .hg directory with Mercurial history. + If you didn't do any changes in the project, while you were working on feature1, you can just update, but it is more likely that you'll have done some changes. In that case, it's time for merging. Merge feature1 into the project code: @@ -171,7 +175,7 @@ $ hg commit -m "merged feature1" -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. +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 ==