Mercurial > hg-website
diff text/learning_mercurial_in_workflows.txt @ 137:defbaee4011c
learning in workflows: two minor fixes.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Fri, 01 May 2009 15:08:35 +0200 |
| parents | 0364cfc00295 |
| children | 741911a6f770 |
line wrap: on
line diff
--- a/text/learning_mercurial_in_workflows.txt Fri May 01 15:07:56 2009 +0200 +++ b/text/learning_mercurial_in_workflows.txt Fri May 01 15:08:35 2009 +0200 @@ -86,7 +86,7 @@ === Workflow === -==== Basics from sysadmin ==== +==== Basics from log keeping ==== Init your project, add files, see changes and commit them. @@ -126,7 +126,7 @@ ==== Fixing errors in earlier revisions ==== -When you find a bug in some earlier revision you have two options: eaither you can fix it in the current code, or you can go back in history and fix the code exactly where you did it. +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. To do so, 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.