# HG changeset patch # User Arne Babenhauserheide # Date 1241183333 -7200 # Node ID 741911a6f770cf285acd28a1020845e6cdcd4688 # Parent defbaee4011c8df991d7a3a1db724d0eaad070ac learning in workflows: A bit of polishing. diff -r defbaee4011c -r 741911a6f770 text/learning_mercurial_in_workflows.txt --- a/text/learning_mercurial_in_workflows.txt Fri May 01 15:08:35 2009 +0200 +++ b/text/learning_mercurial_in_workflows.txt Fri May 01 15:08:53 2009 +0200 @@ -128,7 +128,7 @@ 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. +To do it the cleaner way, 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. Let's assume the bug was introduced in revision 3.