# HG changeset patch # User Arne Babenhauserheide # Date 1241183315 -7200 # Node ID defbaee4011c8df991d7a3a1db724d0eaad070ac # Parent 0364cfc0029515b4de96dd85ecd5206c42f7a526 learning in workflows: two minor fixes. diff -r 0364cfc00295 -r defbaee4011c text/learning_mercurial_in_workflows.txt --- 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.