# HG changeset patch # User timeless@mozdev.org # Date 1345237099 25200 # Node ID dfbcf23582e10bb1054e19fd94aec6b44989c81a # Parent d8d2856a0c7f4bc07914e2f7b7e039c21fb364e3 spelling: supersede diff -r d8d2856a0c7f -r dfbcf23582e1 mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Aug 17 13:58:19 2012 -0700 +++ b/mercurial/localrepo.py Fri Aug 17 13:58:19 2012 -0700 @@ -732,7 +732,7 @@ iterrevs = list(bheadrevs) # This loop prunes out two kinds of heads - heads that are - # superceded by a head in newheadrevs, and newheadrevs that are not + # superseded by a head in newheadrevs, and newheadrevs that are not # heads because an existing head is their descendant. while iterrevs: latest = iterrevs.pop() diff -r d8d2856a0c7f -r dfbcf23582e1 mercurial/tags.py --- a/mercurial/tags.py Fri Aug 17 13:58:19 2012 -0700 +++ b/mercurial/tags.py Fri Aug 17 13:58:19 2012 -0700 @@ -124,8 +124,8 @@ continue # we prefer alltags[name] if: - # it supercedes us OR - # mutual supercedes and it has a higher rank + # it supersedes us OR + # mutual supersedes and it has a higher rank # otherwise we win because we're tip-most anode, ahist = nodehist bnode, bhist = alltags[name]