Mercurial > hg-website
diff text/learning_mercurial_in_workflows.txt @ 138:741911a6f770
learning in workflows: A bit of polishing.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Fri, 01 May 2009 15:08:53 +0200 |
| parents | defbaee4011c |
| children | 2fcd14a3b9f9 |
line wrap: on
line diff
--- 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.