Mercurial > hg-stable
changeset 17520:dfbcf23582e1
spelling: supersede
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 17 Aug 2012 13:58:19 -0700 |
| parents | d8d2856a0c7f |
| children | 6a78548eaa86 |
| files | mercurial/localrepo.py mercurial/tags.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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]